MC-5474: Anchor tag name is used on banner/slide/image wrapper when no link is specified by admin

Remove href and target attributes from data-element="link" when link url is empty

Author: danmooney2

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

@@ -39,7 +39,7 @@
         <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}}]/a[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
-        <element name="emptyLinkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/div[@data-element='link']" parameterized="true"/>
+        <element name="emptyLinkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]/div[@data-element='link'][not(@href) and not(@target)]" 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"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection.xml

@@ -101,7 +101,7 @@
         <element name="buttonItemTextByButtonGroup" type="button" selector="((//div[@data-role='buttons'])[{{arg1}}]//div[@data-role='button-item'])[{{arg2}}]//span[@data-element='link_text' and contains(.,'{{arg3}}')]" parameterized="true"/>
         <element name="buttonItemType" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@class='{{arg2}}']" parameterized="true"/>
         <element name="buttonItemUrl" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@href='{{arg2}}']" parameterized="true"/>
-        <element name="buttonItemEmptyLinkUrl" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='link']" parameterized="true"/>
+        <element name="buttonItemEmptyLinkUrl" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//div[@data-element='link'][not(@href) and not(@target)]" parameterized="true"/>
         <element name="buttonItemNewTab" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[@target='{{arg2}}']" parameterized="true"/>
         <!-- Advanced Configuration -->
         <element name="defaultStyle" type="button" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(@style)]" parameterized="true"/>

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

@@ -95,7 +95,7 @@
         <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}}]//a[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
-        <element name="emptyLinkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='link']" parameterized="true"/>
+        <element name="emptyLinkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='link'][not(@href) and not(@target)]" 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"/>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/master.html

@@ -26,7 +26,7 @@
             </div>
         </div>
     </a>
-    <div ifnot="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
+    <div ifnot="data.link.attributes().href" attr="_.omit(data.link.attributes(), ['href', 'target'])" ko-style="data.link.style" css="data.link.css">
         <div css="data.wrapper.css"
              attr="data.wrapper.attributes"
              ko-style="data.wrapper.style"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/master.html

@@ -26,7 +26,7 @@
             </div>
         </div>
     </a>
-    <div ifnot="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
+    <div ifnot="data.link.attributes().href" attr="_.omit(data.link.attributes(), ['href', 'target'])" ko-style="data.link.style" css="data.link.css">
         <div attr="data.wrapper.attributes"
              ko-style="data.wrapper.style"
              css="data.wrapper.css"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/master.html

@@ -26,7 +26,7 @@
             </div>
         </div>
     </a>
-    <div ifnot="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
+    <div ifnot="data.link.attributes().href" attr="_.omit(data.link.attributes(), ['href', 'target'])" ko-style="data.link.style" css="data.link.css">
         <div attr="data.wrapper.attributes"
              ko-style="data.wrapper.style"
              css="data.wrapper.css"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/master.html

@@ -23,7 +23,7 @@
             </div>
         </div>
     </a>
-    <div ifnot="data.link.attributes().href" data-bind="attr: data.link.attributes, style: data.link.style, css: data.link.css">
+    <div ifnot="data.link.attributes().href" data-bind="attr: _.omit(data.link.attributes(), ['href', 'target']), style: data.link.style, css: data.link.css">
         <div class="pagebuilder-banner-wrapper" attr="data.wrapper.attributes" ko-style="data.wrapper.style" css="data.wrapper.css">
             <div class="pagebuilder-overlay pagebuilder-poster-overlay" attr="data.overlay.attributes" ko-style="data.overlay.style" css="data.overlay.css">
                 <div class="pagebuilder-poster-content">

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/master.html

@@ -9,7 +9,7 @@
     <a if="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
         <span attr="data.link_text.attributes" html="data.link_text.html"></span>
     </a>
-    <div ifnot="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
+    <div ifnot="data.link.attributes().href" attr="_.omit(data.link.attributes(), ['href', 'target'])" ko-style="data.link.style" css="data.link.css">
         <span attr="data.link_text.attributes" html="data.link_text.html"></span>
     </div>
 </div>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/master.html

@@ -37,7 +37,7 @@
             </div>
         </div>
     </a>
-    <div ifnot="data.link.attributes().href" attr="data.link.attributes"
+    <div ifnot="data.link.attributes().href" attr="_.omit(data.link.attributes(), ['href', 'target'])"
        ko-style="data.link.style"
        css="data.link.css">
         <div class="pagebuilder-slide-wrapper"

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/master.html

@@ -37,7 +37,7 @@
             </div>
         </div>
     </a>
-    <div ifnot="data.link.attributes().href" attr="data.link.attributes"
+    <div ifnot="data.link.attributes().href" attr="_.omit(data.link.attributes(), ['href', 'target'])"
        ko-style="data.link.style"
        css="data.link.css">
         <div class="pagebuilder-slide-wrapper"