Skip to content

MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Storefront #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 9, 2018
Merged

MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Storefront #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7d9ba9e
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Sto…
danmooney2 Nov 2, 2018
96bb525
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Sto…
danmooney2 Nov 2, 2018
1bd1278
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Sto…
bdenham Nov 2, 2018
8748ffe
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Sto…
danmooney2 Nov 2, 2018
51003d4
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Sto…
danmooney2 Nov 2, 2018
8ac8883
Merge remote-tracking branch 'origin/MC-5410' into MC-5410
danmooney2 Nov 2, 2018
a3f8932
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Sto…
danmooney2 Nov 2, 2018
68d027f
MC-5410: Banner & Slide Are Missing <A> Tag For Link Attribute On Sto…
danmooney2 Nov 5, 2018
de34b1d
Merge remote-tracking branch 'remotes/mainline/1.0.0-release' into MC…
danmooney2 Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AdvancedSliderItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function render(array $itemData, array $additionalData = []) : string

// mobile wrapper div
$rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '><div data-element="link"';
$rootElementHtml .= isset($eavData['link_url']) ? ' data-href="' . $eavData['link_url'] . '">' : '>';
$rootElementHtml .= isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '">' : '>';
$rootElementHtml .= '<div'
. $this->printAttributes($wrapperDivElementAttributes)
. '><div'
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public function render(array $itemData, array $additionalData = []) : string
$rootElementAttributes['style'] .= $margin;
$linkAttributes = [
'data-element' => 'link',
'data-href' => $eavData['link_url'] ?? '',
'data-target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
'href' => $eavData['link_url'] ?? '',
'target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
];

$imageAttributes = [
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<element name="messageContentTextAreaTextWidget" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
<element name="messageContentText" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
<element name="messageContentHeightJS" type="text" selector="return document.evaluate(&quot;(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='content']//div[contains(text(),'{{arg2}}')]&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.clientHeight;" parameterized="true"/>
<element name="linkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-href,'{{arg2}}')]" parameterized="true"/>
<element name="openInNewTab" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-target,'_blank')]" parameterized="true"/>
<element name="linkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/a[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
<element name="openInNewTab" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/a[@data-element='link'][contains(@target,'_blank')]" parameterized="true"/>
<element name="button" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//button" parameterized="true"/>
<element name="showButton" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][@data-show-button='{{arg2}}']" parameterized="true"/>
<element name="buttonType" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//button[contains(@class,'{{arg2}}')]" parameterized="true"/>
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
<element name="messageContentTextAreaTextWidget" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
<element name="messageContentText" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
<element name="messageContentHeightJS" type="text" selector="return document.evaluate(&quot;(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.clientHeight;" parameterized="true"/>
<element name="linkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//*[@data-element='link'][contains(@data-href,'{{arg2}}')]" parameterized="true"/>
<element name="openInNewTab" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/*[@data-element='link'][contains(@data-target,'_blank')]" parameterized="true"/>
<element name="linkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
<element name="openInNewTab" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/a[@data-element='link'][contains(@target,'_blank')]" parameterized="true"/>
<element name="button" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//button[@data-element='button']" parameterized="true"/>
<element name="noButton" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][not(descendant::*[@data-element='button'])]" parameterized="true"/>
<element name="showButton" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-show-button='{{arg2}}']" parameterized="true"/>
Expand Down
24 changes: 0 additions & 24 deletions app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,12 +823,6 @@
<argument name="selection" value="{{ExternalLink.url}}"/>
<argument name="newTab" value="PageBuilderBannerNewTabDefaultProperty"/>
</actionGroup>
<!-- Add Link To WYSIWYG -->
<comment userInput="Add Link To WYSIWYG" stepKey="commentAddLink"/>
<actionGroup ref="insertLinkInWYSIWYG" stepKey="insertLinkInWYSIWYG">
<argument name="url" value="{{ExternalLink.googleUrl}}"/>
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
</actionGroup>
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
<!-- Validate Stage -->
Expand Down Expand Up @@ -861,15 +855,6 @@
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlPropertyValidate.value)}}" stepKey="clickLinkUrlStorefront"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefront" />
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlPropertyValidate.value}}" stepKey="seeThatUrlIsChangedToButtonUrlStorefront" />
<!-- Click wysiwyg anchor -->
<comment userInput="Click wysiwyg anchor" stepKey="clickWysiwygLinkAnchorStorefront" />
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront2">
<argument name="contentType" value="PageBuilderBannerContentType"/>
</actionGroup>
<seeElement selector="{{BannerOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="seeWysiwygLinkUrlStorefront"/>
<click selector="{{BannerOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="clickWysiwygLinkUrlStorefront"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefront2" />
<seeCurrentUrlEquals url="{{ExternalLink.googleUrl}}" stepKey="seeThatUrlIsChangedToWysiwygLinkUrlStorefront" />
<!-- Validate Storefront Mobile -->
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront3">
<argument name="contentType" value="PageBuilderBannerContentType"/>
Expand All @@ -889,15 +874,6 @@
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlPropertyValidate.value)}}" stepKey="clickLinkUrlStorefrontMobile"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefrontMobile" />
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlPropertyValidate.value}}" stepKey="seeThatUrlIsChangedToButtonUrlStorefrontMobile" />
<!-- Click mobile wysiwyg anchor -->
<comment userInput="Click mobile wysiwyg anchor" stepKey="clickMobileWysiwygLinkAnchorStorefront" />
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront4">
<argument name="contentType" value="PageBuilderBannerContentType"/>
</actionGroup>
<seeElement selector="{{BannerOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="seeMobileWysiwygLinkUrlStorefront"/>
<click selector="{{BannerOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="clickMobileWysiwygLinkUrlStorefront"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefrontMobile2" />
<seeCurrentUrlEquals url="{{ExternalLink.googleUrl}}" stepKey="seeThatUrlIsChangedToMobileWysiwygLinkUrlStorefront" />
</test>
<test name="BannerPosterOverlayPosition">
<annotations>
Expand Down
24 changes: 0 additions & 24 deletions ...ode/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTests.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,12 +598,6 @@
<argument name="selection" value="{{ExternalLink.url}}"/>
<argument name="newTab" value="PageBuilderSlideItemLinkNewTab_False"/>
</actionGroup>
<!-- Add Link To WYSIWYG -->
<comment userInput="Add Link To WYSIWYG" stepKey="commentAddLink"/>
<actionGroup ref="insertLinkInWYSIWYG" stepKey="insertLinkInWYSIWYG">
<argument name="url" value="{{ExternalLink.googleUrl}}"/>
<argument name="textToDisplay" value="{{ExternalLink.googleUrl}}"/>
</actionGroup>
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
<!-- Validate Stage -->
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
Expand Down Expand Up @@ -635,15 +629,6 @@
<click selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_External.value)}}" stepKey="clickLinkUrlStorefront"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefront" />
<seeCurrentUrlEquals url="{{PageBuilderSlideItemLinkURL_External.value}}" stepKey="seeThatUrlIsChangedToButtonUrlStorefront" />
<!-- Click wysiwyg anchor -->
<comment userInput="Click wysiwyg anchor" stepKey="clickWysiwygLinkAnchorStorefront" />
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront2">
<argument name="contentType" value="PageBuilderSliderContentType"/>
</actionGroup>
<seeElement selector="{{SlideOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="seeWysiwygLinkUrlStorefront"/>
<click selector="{{SlideOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="clickWysiwygLinkUrlStorefront"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefront2" />
<seeCurrentUrlEquals url="{{ExternalLink.googleUrl}}" stepKey="seeThatUrlIsChangedToWysiwygLinkUrlStorefront" />
<!-- Validate Storefront Mobile -->
<comment userInput="Validate Storefront Mobile" stepKey="commentValidateStorefrontMobile"/>
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront3">
Expand All @@ -663,15 +648,6 @@
<click selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_External.value)}}" stepKey="clickLinkUrlStorefrontMobile"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefrontMobile" />
<seeCurrentUrlEquals url="{{PageBuilderSlideItemLinkURL_External.value}}" stepKey="seeThatUrlIsChangedToButtonUrlStorefrontMobile" />
<!-- Click mobile wysiwyg anchor -->
<comment userInput="Click mobile wysiwyg anchor" stepKey="clickMobileWysiwygLinkAnchorStorefront" />
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront4">
<argument name="contentType" value="PageBuilderSliderContentType"/>
</actionGroup>
<seeElement selector="{{SlideOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="seeMobileWysiwygLinkUrlStorefront"/>
<click selector="{{SlideOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="clickMobileWysiwygLinkUrlStorefront"/>
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurStorefrontMobile2" />
<seeCurrentUrlEquals url="{{ExternalLink.googleUrl}}" stepKey="seeThatUrlIsChangedToMobileWysiwygLinkUrlStorefront" />
</test>
<test name="SlideItemPosterOverlayPosition">
<annotations>
Expand Down
6 changes: 0 additions & 6 deletions app/code/Magento/PageBuilder/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,9 +511,6 @@
<item name="dataRole" xsi:type="string">slide</item>
</item>
</item>
<item name="clickEventBinder" xsi:type="array">
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/click-event-binder</item>
</item>
</item>
<item name="banner" xsi:type="array">
<item name="default" xsi:type="array">
Expand All @@ -524,9 +521,6 @@
<item name="dataRole" xsi:type="string">banner</item>
</item>
</item>
<item name="clickEventBinder" xsi:type="array">
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/click-event-binder</item>
</item>
</item>
<item name="buttons" xsi:type="array">
<item name="default" xsi:type="array">
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/banner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</element>
<element name="link">
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
</element>
<element name="wrapper">
Expand Down Expand Up @@ -99,8 +99,8 @@
</element>
<element name="link">
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
</element>
<element name="wrapper">
Expand Down Expand Up @@ -165,8 +165,8 @@
</element>
<element name="link">
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
</element>
<element name="wrapper">
Expand Down Expand Up @@ -232,8 +232,8 @@
</element>
<element name="link">
<attribute name="link_url" reader="Magento_PageBuilder/js/property/link" persistence_mode="read"/>
<attribute name="virtual_link_href" storage_key="link_url" source="data-href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="data-target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_href" storage_key="link_url" source="href" converter="Magento_PageBuilder/js/converter/attribute/link-href" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/link-href"/>
<attribute name="virtual_link_target" storage_key="link_url" source="target" converter="Magento_PageBuilder/js/converter/attribute/link-target" persistence_mode="write"/>
<attribute name="virtual_link_type" storage_key="link_url" source="data-link-type" converter="Magento_PageBuilder/js/converter/attribute/link-type" persistence_mode="write"/>
</element>
<element name="wrapper">
Expand Down
Loading