Skip to content

Commit e0416f0

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/MC-3934' into cms-team-1-delivery
 Conflicts: app/code/Magento/PageBuilder/view/adminhtml/web/js/property/link.js app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/link.ts
2 parents 55e966b + 4cdb82e commit e0416f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+447
-536
lines changed

‎app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public function __construct(array $config)
2828

2929
/**
3030
* Retrieves the component-ready configuration for the widget initializer
31+
*
3132
* @return array
3233
*/
3334
public function getConfig(): array
@@ -43,9 +44,9 @@ public function getConfig(): array
4344
$selector .= sprintf('[data-appearance="%s"]', $item['appearance']);
4445
}
4546
$componentConfig = isset($item['config']) ? $item['config'] : '{}';
46-
$resultConfig[$selector] = [$item['component'] => $componentConfig];
47+
$resultConfig[$selector][$item['component']] = $componentConfig;
4748
}
4849
}
4950
return $resultConfig;
5051
}
51-
}
52+
}

‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AdvancedSliderItem.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ class AdvancedSliderItem implements RendererInterface
2626
*/
2727
private $eavAttributeLoader;
2828

29+
/**
30+
* @param StyleExtractorInterface $styleExtractor
31+
* @param EavAttributeLoaderInterface $eavAttributeLoader
32+
*/
2933
public function __construct(
3034
StyleExtractorInterface $styleExtractor,
3135
EavAttributeLoaderInterface $eavAttributeLoader
@@ -35,7 +39,7 @@ public function __construct(
3539
}
3640

3741
/**
38-
* {@inheritdoc}
42+
* @inheritdoc
3943
*
4044
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
4145
* @SuppressWarnings(PHPMD.NPathComplexity)
@@ -103,8 +107,8 @@ public function render(array $itemData, array $additionalData = []) : string
103107
}
104108

105109
// mobile wrapper div
106-
$rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '><a data-element="link"';
107-
$rootElementHtml .= isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '">' : '>';
110+
$rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '><div data-element="link"';
111+
$rootElementHtml .= isset($eavData['link_url']) ? ' data-href="' . $eavData['link_url'] . '">' : '>';
108112
$rootElementHtml .= '<div'
109113
. $this->printAttributes($wrapperDivElementAttributes)
110114
. '><div'
@@ -134,7 +138,7 @@ public function render(array $itemData, array $additionalData = []) : string
134138
. $buttonElementHtml
135139
. '</div></div></div>';
136140

137-
$rootElementHtml .= '</a></div>';
141+
$rootElementHtml .= '</div></div>';
138142

139143
return $rootElementHtml;
140144
}

‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Driver.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ class Driver implements RendererInterface
3232
*/
3333
private $serializer;
3434

35+
/**
36+
* @param StyleExtractorInterface $styleExtractor
37+
* @param EavAttributeLoaderInterface $eavAttributeLoader
38+
* @param Json $serializer
39+
*/
3540
public function __construct(
3641
StyleExtractorInterface $styleExtractor,
3742
EavAttributeLoaderInterface $eavAttributeLoader,
@@ -43,7 +48,7 @@ public function __construct(
4348
}
4449

4550
/**
46-
* {@inheritdoc}
51+
* @inheritdoc
4752
*/
4853
public function render(array $itemData, array $additionalData = []) : string
4954
{
@@ -80,8 +85,8 @@ public function render(array $itemData, array $additionalData = []) : string
8085
$rootElementAttributes['style'] .= $margin;
8186
$linkAttributes = [
8287
'data-element' => 'link',
83-
'href' => $eavData['link_url'] ?? '',
84-
'target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
88+
'data-href' => $eavData['link_url'] ?? '',
89+
'data-target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
8590
];
8691
$imageAttributes = [
8792
'data-element' => 'desktop_image',
@@ -123,7 +128,7 @@ public function render(array $itemData, array $additionalData = []) : string
123128

124129
return '<div'
125130
. $this->printAttributes($rootElementAttributes)
126-
. '><a'
131+
. '><div'
127132
. $this->printAttributes($linkAttributes)
128133
. '>'
129134
. $imageElementHtml
@@ -135,7 +140,7 @@ public function render(array $itemData, array $additionalData = []) : string
135140
. $overlayElementHtml
136141
. '<div class="pagebuilder-poster-content"><div data-element="content"></div>'
137142
. $buttonHtml
138-
. '</div></div></div></a></div>';
143+
. '</div></div></div></div></div>';
139144
}
140145

141146
/**

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<entity name="PageBuilderBannerLinkUrlPropertyValidate" type="pagebuilder_banner_linkUrl_property">
8888
<data key="name">Link</data>
8989
<data key="section">contents</data>
90-
<data key="fieldName">link_url[default]</data>
90+
<data key="fieldName">link_url</data>
9191
<data key="value">http://url.magento/</data>
9292
</entity>
9393
<entity name="PageBuilderBannerNewTabDefaultProperty" type="pagebuilder_banner_newTab_property">

‎app/code/Magento/PageBuilder/Test/Mftf/Data/LinkData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<data key="product">Product</data>
1414
<data key="category">Category</data>
1515
<data key="page">Page</data>
16-
<data key="googleUrl">https://www.google.com</data>
16+
<data key="googleUrl">https://www.google.com/</data>
1717
</entity>
1818
<entity name="ExternalLinkSearch" type="pagebuilder_external_link">
1919
<data key="page">cm</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<element name="noMessageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
4141
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
4242
<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"/>
43-
<element name="linkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/a[contains(@href,'{{arg2}}')]" parameterized="true"/>
44-
<element name="openInNewTab" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/a[contains(@target,'_blank')]" parameterized="true"/>
43+
<element name="linkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-href,'{{arg2}}')]" parameterized="true"/>
44+
<element name="openInNewTab" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/*[@data-element='link'][contains(@data-target,'_blank')]" parameterized="true"/>
4545
<element name="button" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//button" parameterized="true"/>
4646
<element name="mobileButton" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//button" parameterized="true"/>
4747
<element name="showButton" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][@data-show-button='{{arg2}}']" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969
<element name="base" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]" parameterized="true"/>
7070
<element name="slickSlideIndex" type="text" selector="[data-slick-index='{{arg1}}']" parameterized="true"/>
7171
<element name="computedBoxSizing" type="button" selector="return window.getComputedStyle(document.querySelector('[data-role=slide]')).boxSizing"/>
72+
<element name="wysiwygLinkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image']//a[@href='{{arg2}}']" parameterized="true"/>
73+
<element name="mobileWysiwygLinkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image']//a[@href='{{arg2}}']" parameterized="true"/>
7274
<!-- Appearance Configuration -->
7375
<element name="appearance" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
7476
<element name="slideName" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-slide-name='{{arg2}}']" parameterized="true"/>
@@ -97,8 +99,8 @@
9799
<element name="noMessageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][not(*)]" parameterized="true"/>
98100
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
99101
<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"/>
100-
<element name="linkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
101-
<element name="openInNewTab" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/a[contains(@target,'_blank')]" parameterized="true"/>
102+
<element name="linkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//*[@data-element='link'][contains(@data-href,'{{arg2}}')]" parameterized="true"/>
103+
<element name="openInNewTab" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/*[@data-element='link'][contains(@data-target,'_blank')]" parameterized="true"/>
102104
<element name="button" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image']//button[@data-element='button']" parameterized="true"/>
103105
<element name="noButton" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][not(descendant::*[@data-element='button'])]" parameterized="true"/>
104106
<element name="showButton" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-show-button='{{arg2}}']" parameterized="true"/>

0 commit comments

Comments
 (0)