Merge remote-tracking branch 'owls/MC-3429-remove-anchor' into cms-team-2-sprint-14

Author: krissyhiserote

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Anchor.php

@@ -45,9 +45,6 @@ public function render(array $itemData, array $additionalData = []) : string
         $eavData = $this->eavAttributeLoader->load($itemData['entityId']);
 
         $rootElementAttributes = [
-            'data-element' => 'main',
-            'data-role' => 'anchor',
-            'data-appearance' => 'default',
             'class' => $eavData['css_classes'] ?? '',
             'id' => $eavData['anchor_id']
         ];
@@ -59,11 +56,14 @@ public function render(array $itemData, array $additionalData = []) : string
             }
         }
 
-        $rootElementHtml = '<div';
+        $anchorHtml = '<div';
         foreach ($rootElementAttributes as $attributeName => $attributeValue) {
-            $rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
+            $anchorHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
         }
-        $rootElementHtml .= '></div>';
+        $anchorHtml .= '></div>';
+
+        $rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
+        $rootElementHtml .= $anchorHtml . '</div>';
 
         return $rootElementHtml;
     }

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeAnchorActionGroup.xml

@@ -29,14 +29,13 @@
         <see userInput="Column" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupColumn"/>
         <see userInput="Tabs" selector="{{PageBuilderPanel.layoutGroupContentType}}" stepKey="seeLayoutGroupTabs"/>
         <click selector="{{PageBuilderPanel.elementsGroup}}" stepKey="clickElementsGroup"/>
-        <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('elements')}}" userInput="7" stepKey="seeNumberOfElementsGroupContentTypes"/>
+        <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('elements')}}" userInput="6" stepKey="seeNumberOfElementsGroupContentTypes"/>
         <see userInput="Elements" selector="{{PageBuilderPanel.elementsGroup}}" stepKey="seeElementsGroup"/>
         <see userInput="Text" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupText"/>
         <see userInput="Heading" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHeading"/>
         <see userInput="Buttons" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupButtons"/>
         <see userInput="Divider" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupDivider"/>
         <see userInput="Newsletter" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupNewsletter"/>
-        <see userInput="Anchor" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupAnchor"/>
         <see userInput="HTML Code" selector="{{PageBuilderPanel.elementsGroupContentType}}" stepKey="seeElementsGroupHtml"/>
         <click selector="{{PageBuilderPanel.mediaGroup}}" stepKey="clickMediaGroup"/>
         <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('media')}}" userInput="5" stepKey="seeNumberOfMediaGroupContentTypes"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup.xml

@@ -81,12 +81,6 @@
         <data key="fieldName">link_url[default]</data>
         <data key="value">http://url.magento/</data>
     </entity>
-    <entity name="PageBuilderBannerLink_Anchor" type="pagebuilder_banner_linkUrl_property">
-        <data key="name">Link</data>
-        <data key="section">contents</data>
-        <data key="fieldName">link_url</data>
-        <data key="value">#my-anchor-id</data>
-    </entity>
     <entity name="PageBuilderBannerNewTabDefaultProperty" type="pagebuilder_banner_newTab_property">
         <data key="name">Open in new tab</data>
         <data key="section">contents</data>

app/code/Magento/PageBuilder/Test/Mftf/Data/AnchorData.xml

@@ -77,12 +77,6 @@
         <data key="role">newsletter</data>
         <data key="pageNamePrefix">newsletter</data>
     </entity>
-    <entity name="PageBuilderAnchorContentType" type="pagebuilder_content_type">
-        <data key="name">Anchor</data>
-        <data key="section">Elements</data>
-        <data key="role">anchor</data>
-        <data key="pageNamePrefix">anchor</data>
-    </entity>
     <entity name="PageBuilderHtmlContentType" type="pagebuilder_content_type">
         <data key="name">HTML Code</data>
         <data key="section">Elements</data>