Skip to content

Commit ea658f3

Browse files
author
Michael Yu
committed
MC-407: Empty banner displays on store front as big empty area
- Updated converters to use new form vlaues - Added test coverage for the bug
1 parent 288bcdd commit ea658f3

File tree

3 files changed

+117
-3
lines changed

3 files changed

+117
-3
lines changed

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

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,4 +1200,118 @@
12001200
<argument name="section" value="PageBuilderActionsSection"/>
12011201
</actionGroup>
12021202
</test>
1203+
<test name="BannerEmptyBannerTakeNoSpaceOnStoreFrontValidation">
1204+
<annotations>
1205+
<features value="Pagebuilder: Banner"/>
1206+
<stories value="MC-407: Empty banner displays on store front as big empty area"/>
1207+
<title value=" Validate empty banner does not take up space on store front"/>
1208+
<description value="Validate empty banner does not take up space on store fronts"/>
1209+
<severity value="CRITICAL"/>
1210+
<group value="pagebuilder"/>
1211+
<group value="pagebuilder-banner"/>
1212+
<group value="pagebuilder-bannerCommon"/>
1213+
<group value="m"/>
1214+
1215+
</annotations>
1216+
<before>
1217+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1218+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1219+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1220+
</before>
1221+
<after>
1222+
<closeTab stepKey="closeTab"/>
1223+
<actionGroup ref="logout" stepKey="logout"/>
1224+
</after>
1225+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1226+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1227+
</actionGroup>
1228+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1229+
<argument name="group" value="PageBuilderBannerContentType"/>
1230+
</actionGroup>
1231+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1232+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1233+
</actionGroup>
1234+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1235+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1236+
<!-- Validate Stage -->
1237+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1238+
<waitForElementVisible time="2" selector="{{BannerOnBackend.emptyPoster}}" stepKey="waitForPoster" />
1239+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeEmptyBannerContent"/>
1240+
<openNewTab stepKey="openNewTab"/>
1241+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1242+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1243+
</actionGroup>
1244+
<!-- Validate Storefront -->
1245+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1246+
<dontSeeElement selector="{{BannerOnFrontend.banner}}" stepKey="dontSeeBannerOnStoreFront"/>
1247+
<!-- Go back to cms page and change configuration to collage left -->
1248+
<comment userInput="Go back to cms page and change configuration to collage left" stepKey="commentCollageLeft"/>
1249+
<switchToPreviousTab stepKey="switchToPreviousTab"/>
1250+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageToEditPoster">
1251+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1252+
</actionGroup>
1253+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCollageLeftProperty">
1254+
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
1255+
</actionGroup>
1256+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsCollageLeft"/>
1257+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPageWithCollageLeftBanner"/>
1258+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1259+
<!-- Validate Stage -->
1260+
<comment userInput="Validate Stage" stepKey="commentValidateStage2"/>
1261+
<waitForElementVisible time="2" selector="{{BannerOnBackend.emptyCollageLeft}}" stepKey="waitForCollageLeft" />
1262+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeEmptyBannerContent2"/>
1263+
<switchToNextTab stepKey="switchToNextTab"/>
1264+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront2">
1265+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1266+
</actionGroup>
1267+
<!-- Validate Storefront -->
1268+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront2"/>
1269+
<dontSeeElement selector="{{BannerOnFrontend.banner}}" stepKey="dontSeeBannerOnStoreFront2"/>
1270+
<!-- Go back to cms page and change configuration to collage centered -->
1271+
<comment userInput="Go back to cms page and change configuration to collage centered" stepKey="commentCollageCenter"/>
1272+
<switchToPreviousTab stepKey="switchToPreviousTab2"/>
1273+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageToEditCollageLeft">
1274+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1275+
</actionGroup>
1276+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCollageCenteredProperty">
1277+
<argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
1278+
</actionGroup>
1279+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsCollageCentered"/>
1280+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPageWithCollageCenteredBanner"/>
1281+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
1282+
<!-- Validate Stage -->
1283+
<comment userInput="Validate Stage" stepKey="commentValidateStage3"/>
1284+
<waitForElementVisible time="2" selector="{{BannerOnBackend.emptyCollageCentered}}" stepKey="waitForCollageCentered" />
1285+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeEmptyBannerContent3"/>
1286+
<switchToNextTab stepKey="switchToNextTab2"/>
1287+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront3">
1288+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1289+
</actionGroup>
1290+
<!-- Validate Storefront -->
1291+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront3"/>
1292+
<dontSeeElement selector="{{BannerOnFrontend.banner}}" stepKey="dontSeeBannerOnStoreFront3"/>
1293+
<!-- Go back to cms page and change configuration to collage right -->
1294+
<comment userInput="Go back to cms page and change configuration to collage right" stepKey="commentCollageRight"/>
1295+
<switchToPreviousTab stepKey="switchToPreviousTab3"/>
1296+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageToEditCollageCentered">
1297+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1298+
</actionGroup>
1299+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCollageRightProperty">
1300+
<argument name="property" value="PageBuilderBannerCollageRightProperty"/>
1301+
</actionGroup>
1302+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsCollageRight"/>
1303+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPageWithCollageRightBanner"/>
1304+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage4"/>
1305+
<!-- Validate Stage -->
1306+
<comment userInput="Validate Stage" stepKey="commentValidateStage4"/>
1307+
<waitForElementVisible time="2" selector="{{BannerOnBackend.emptyCollageRight}}" stepKey="waitForCollageRight" />
1308+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeEmptyBannerContent4"/>
1309+
<switchToNextTab stepKey="switchToNextTab3"/>
1310+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront4">
1311+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1312+
</actionGroup>
1313+
<!-- Validate Storefront -->
1314+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront4"/>
1315+
<dontSeeElement selector="{{BannerOnFrontend.banner}}" stepKey="dontSeeBannerOnStoreFront4"/>
1316+
</test>
12031317
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/converter/style/display.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/ts/js/content-type/banner/converter/style/display.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ export default class Display implements ConverterInterface {
3030
&& data.background_image.length === 0
3131
&& (!data.link_url || !data.link_url.default || data.link_url.default === "")
3232
&& data.message === ""
33-
&& data.show_button === "never_show"
34-
&& data.show_overlay === "never_show"
33+
&& data.show_button === "never"
34+
&& data.show_overlay === "never"
3535
) {
3636

3737
return "none";

0 commit comments

Comments
 (0)