Merge remote-tracking branch 'owls/MC-3430-remove-newsletter' into cms-team-2-sprint-15

Author: krissyhiserote

app/code/Magento/PageBuilder/Model/Template/Filter.php

@@ -44,31 +44,67 @@ public function render(array $itemData, array $additionalData = []) : string
         }
         $eavData = $this->eavAttributeLoader->load($itemData['entityId']);
 
-        $rootElementAttributes = [
-            'data-element' => 'main',
-            'data-role' => 'newsletter',
-            'data-appearance' => 'default',
-            'class' => $itemData['formData']['css_classes'] ?? '',
-            'data-button-text' => $eavData['button_text'] ?? '',
-            'data-label-text' => $eavData['label'] ?? '',
-            'data-title' => $eavData['title'] ?? '',
-            'data-placeholder' => $eavData['placeholder'] ?? '',
-        ];
+        $rootElementHtml = '<div data-element="main" data-role="html" data-appearance="default">';
+        $rootElementHtml .= $this->getNewsletterHtml($itemData, $eavData) . '</div>';
 
+        return $rootElementHtml;
+    }
+
+    /**
+     * Get the html for the newsletter
+     *
+     * @param array $itemData
+     * @param array $eavData
+     * @return string
+     */
+    private function getNewsletterHtml(array $itemData, array $eavData): string
+    {
+        $newsletterButtonText = $eavData['button_text'] ?? __('Subscribe');
+        $newsletterLabel = $eavData['label'] ?? __('Sign Up for Our Newsletter:');
+        $newsletterTitle = $eavData['title'] ?? __('Newsletter');
+        $newsletterPlaceHolder = $eavData['placeholder'] ?? __('Enter your email address');
+        $newsletterClasses = $eavData['css_classes'] ?? '';
+        $newsletterStyles = '';
         if (isset($itemData['formData'])) {
+            $justifyContent = '';
+            if (isset($itemData['formData']['align'])) {
+                $convertAlignContent = [
+                    'left' => 'flex-start',
+                    'right' => 'flex-end',
+                    'center' => 'center'
+                ];
+                $itemData['formData']['display'] = 'flex';
+                $justifyContent = ' justify-content: ' . $convertAlignContent[$itemData['formData']['align']] . ';';
+                unset($itemData['formData']['align']);
+            }
             $style = $this->styleExtractor->extractStyle($itemData['formData']);
             if ($style) {
-                $rootElementAttributes['style'] = $style;
+                $newsletterStyles = $style . $justifyContent;
             }
         }
 
-        $rootElementHtml = '<div';
-        foreach ($rootElementAttributes as $attributeName => $attributeValue) {
-            $rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
-        }
+        $newsletterHtml = '<div class="' . $newsletterClasses . '" style="' . $newsletterStyles . '">' .
+            '<div class="block newsletter"><div class="title"><strong>' . $newsletterTitle . '</strong></div>' .
+            '<div class="content">' .
+            '<form class="form subscribe" novalidate method="post" ' .
+                   'action="{{store direct_url=\'newsletter/subscriber/new\' _secure=1}}" ' .
+                   'data-mage-init=\'{"validation": {"errorClass": "mage-error"}}\'>' .
+            '<div class="field newsletter">' .
+            '<label class="label" for="newsletter-' . $itemData['entityId'] . '">' .
+            '<span>' . $newsletterLabel . '</span>'.
+            '</label>' .
+            '<div class="control">' .
+            '<input name="email" type="email" id="newsletter-' . $itemData['entityId'] . '" '.
+                    'placeholder="' . $newsletterPlaceHolder . '" ' .
+                    'data-mage-init=\'{"mage/trim-input":{}}\' ' .
+                    'data-validate="{required:true, \'validate-email\':true}"/>' .
+            '</div></div>' .
+            '<div class="actions">' .
+            '<button class="action subscribe primary" title="' . $newsletterButtonText . '" type="submit">' .
+            '<span>' . $newsletterButtonText . '</span>' .
+            '</button>' .
+            '</div></form></div></div></div>';
 
-        $rootElementHtml .= '></div>';
-
-        return $rootElementHtml;
+        return $newsletterHtml;
     }
 }

app/code/Magento/PageBuilder/Plugin/Cms/Block/Block.php

@@ -29,13 +29,12 @@
         <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="6" stepKey="seeNumberOfElementsGroupContentTypes"/>
+        <seeNumberOfElements selector="{{PageBuilderPanel.allGroupContentTypes('elements')}}" userInput="5" 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="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/Plugin/Cms/Block/Page.php

@@ -71,12 +71,6 @@
         <data key="role">divider</data>
         <data key="pageNamePrefix">divider</data>
     </entity>
-    <entity name="PageBuilderNewsletterContentType" type="pagebuilder_content_type">
-        <data key="name">Newsletter</data>
-        <data key="section">Elements</data>
-        <data key="role">newsletter</data>
-        <data key="pageNamePrefix">newsletter</data>
-    </entity>
     <entity name="PageBuilderHtmlContentType" type="pagebuilder_content_type">
         <data key="name">HTML Code</data>
         <data key="section">Elements</data>