Skip to content

Commit fabac60

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/MC-3773-delete-second-slide' into cms-team-1-delivery
 # Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest.xml # app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/preview.html
2 parents 810db63 + af90851 commit fabac60

File tree

4 files changed

+122
-1
lines changed

4 files changed

+122
-1
lines changed

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

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,4 +1552,117 @@
15521552
<actualResult type="variable">columnOneTextHeight</actualResult>
15531553
</assertGreaterThan>
15541554
</test>
1555+
<test name="SlideItemBackgroundColorAlwaysDisplayed">
1556+
<annotations>
1557+
<features value="PageBuilder"/>
1558+
<stories value="Slider"/>
1559+
<title value="Slide Item - The background color should always be displayed"/>
1560+
<description value="Ensure operations performed on the slider and slide item don't cause the background color to be hidden"/>
1561+
<severity value="MAJOR"/>
1562+
<useCaseId value="MC-3773"/>
1563+
<testCaseId value="MC-4107"/>
1564+
<group value="pagebuilder"/>
1565+
<group value="pagebuilder-slide"/>
1566+
<group value="pagebuilder-slideItemCommon"/>
1567+
</annotations>
1568+
<before>
1569+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1570+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1571+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1572+
</before>
1573+
<after>
1574+
<actionGroup ref="logout" stepKey="logout"/>
1575+
</after>
1576+
<!-- Add Slider to Stage -->
1577+
<comment userInput="Add Slider to Stage" stepKey="addSliderToStage"/>
1578+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1579+
<argument name="group" value="PageBuilderSliderContentType"/>
1580+
</actionGroup>
1581+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragSliderIntoStage">
1582+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1583+
</actionGroup>
1584+
<!-- Fill first slide data -->
1585+
<comment userInput="Fill first slide data." stepKey="fillSlide1"/>
1586+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="inputPlaintext">
1587+
<argument name="property" value="PageBuilderBackgroundColor_Plaintext_Green"/>
1588+
</actionGroup>
1589+
<actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE">
1590+
<argument name="property" value="PageBuilderSlideItemContent_Slide1"/>
1591+
<argument name="section" value="SlideOnConfigurationPanel"/>
1592+
</actionGroup>
1593+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel1Settings"/>
1594+
<!-- Validate first slide -->
1595+
<comment userInput="Validate first slide" stepKey="checkFilledData"/>
1596+
<click stepKey="unfocusNavigation" selector="{{PageBuilderPanel.searchPanel}}"/>
1597+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterSave"/>
1598+
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlide1BackgroundColor"/>
1599+
<!-- Test removing duplicated slide -->
1600+
<comment userInput="Test removing duplicated slide" stepKey="commentDuplicate"/>
1601+
<actionGroup ref="duplicateSmallContentType" stepKey="duplicateSmallContentType">
1602+
<argument name="section" value="SlideOnBackend"/>
1603+
<argument name="targetIndex" value="1"/>
1604+
</actionGroup>
1605+
<seeElement selector="{{SlideOnBackend.messageContent('2', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideDuplicatedContent"/>
1606+
<seeElement selector="{{SlideOnBackend.backgroundColor('2', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlideDuplicatedBackground"/>
1607+
<!-- Verify the first slides background and message are still present -->
1608+
<comment userInput="Verify the first slides background and message are still present" stepKey="verifySlide1RetainedBackground"/>
1609+
<click selector="{{SliderOnStage.slideNavigationDot('1', '1')}}" stepKey="clickSlideOptionsMenu"/>
1610+
<waitForPageLoad stepKey="waitForSlideNavigation" />
1611+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlide1MessageAfterAdd"/>
1612+
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlide1BackgroundAfterAdd"/>
1613+
<click selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="clickSlideOptionsMenu1"/>
1614+
<waitForPageLoad stepKey="waitForSlideNavigation1" />
1615+
<actionGroup ref="removeContentTypeFromStageSmallByIndex" stepKey="removeSlideFromStage">
1616+
<argument name="section" value="SlideOnBackend"/>
1617+
<argument name="targetIndex" value="2"/>
1618+
</actionGroup>
1619+
<actionGroup ref="confirmRemovalModal" stepKey="confirmRemovalModal"/>
1620+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterDelete"/>
1621+
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlideBackgroundAfterDelete"/>
1622+
<!-- Test removing added slide -->
1623+
<comment userInput="Test removing added slide" stepKey="commentAddedSlide"/>
1624+
<actionGroup ref="addSlide" stepKey="addNewSlide" />
1625+
<!-- Fill first slide data -->
1626+
<comment userInput="Fill second slide data." stepKey="fillSlide2"/>
1627+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="inputSlideColorWhite">
1628+
<argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
1629+
</actionGroup>
1630+
<actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE1">
1631+
<argument name="property" value="PageBuilderSlideItemContent_Slide2"/>
1632+
<argument name="section" value="SlideOnConfigurationPanel"/>
1633+
</actionGroup>
1634+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel2Settings"/>
1635+
<seeElement selector="{{SlideOnBackend.messageContent('2', PageBuilderSlideItemContent_Slide2.value)}}" stepKey="seeNewSlideDuplicatedContent"/>
1636+
<seeElement selector="{{SlideOnBackend.backgroundColor('2', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeNewSlideDuplicatedBackground"/>
1637+
<!-- Verify the first slides background and message are still present -->
1638+
<comment userInput="Verify the first slides background and message are still present" stepKey="verifySlide1RetainedBackground1"/>
1639+
<click selector="{{SliderOnStage.slideNavigationDot('1', '1')}}" stepKey="clickSlideOptionsMenu2"/>
1640+
<waitForPageLoad stepKey="waitForSlideNavigation2" />
1641+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlide1MessageAfterAdd1"/>
1642+
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlide1BackgroundAfterAdd1"/>
1643+
<click selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="clickSlideOptionsMenu3"/>
1644+
<waitForPageLoad stepKey="waitForSlideNavigation3" />
1645+
<actionGroup ref="removeContentTypeFromStageSmallByIndex" stepKey="removeNewSlideFromStage">
1646+
<argument name="section" value="SlideOnBackend"/>
1647+
<argument name="targetIndex" value="2"/>
1648+
</actionGroup>
1649+
<actionGroup ref="confirmRemovalModal" stepKey="confirmRemovalModal1"/>
1650+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterDelete1"/>
1651+
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlideBackgroundAfterDelete1"/>
1652+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu">
1653+
<argument name="contentType" value="PageBuilderSlideContentType"/>
1654+
</actionGroup>
1655+
<actionGroup ref="hideContentType" stepKey="hideContentType">
1656+
<argument name="section" value="SliderOnStage"/>
1657+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1658+
</actionGroup>
1659+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterHide"/>
1660+
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlideBackgroundColorAfterHide"/>
1661+
<actionGroup ref="showContentType" stepKey="showContentType">
1662+
<argument name="section" value="SliderOnStage"/>
1663+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1664+
</actionGroup>
1665+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterHideShow"/>
1666+
<seeElement selector="{{SlideOnBackend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeSlideBackgroundColorAfterHideShow"/>
1667+
</test>
15551668
</tests>

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

Lines changed: 4 additions & 0 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/template/content-type/slider/default/preview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
tabindex="0"
2323
event="focusin: $parent.setFocusedSlide.bind($parent, $index(), false), focusout: $parent.onFocusOut.bind($parent)"
2424
css="active: $parent.activeSlide() === $index(), focus: $parent.focusedSlide() === $index()">
25-
<a class="navigation-dot-anchor" href="#" click="$parent.onControlClick.bind($parent, $index())" hasFocus="$parent.focusedSlide() === $index()"/>
25+
<a class="navigation-dot-anchor" href="#" click="$parent.onControlClick.bind($parent, $index())" data-bind="hasFocusNoScroll: $parent.focusedSlide() === $index()"/>
2626
<with args="preview">
2727
<render with="preview" args="getOptions().template" />
2828
</with>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@ export default class Preview extends PreviewCollection {
281281
const data = this.parent.children().slice(0);
282282
this.parent.children([]);
283283
this.parent.children(data);
284+
285+
_.defer(() => {
286+
this.buildSlick();
287+
});
284288
}
285289
});
286290

0 commit comments

Comments
 (0)