Merge remote-tracking branch 'origin/MAGETWO-88132-add-edit-location-to-map' into cms-team-2-sprint-9

Author: tjwiebell

app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CancelButton.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Block\Adminhtml\ContentType\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+class CancelButton implements ButtonProviderInterface
+{
+    /**
+     * @var string
+     */
+    private $targetName;
+
+    /**
+     * Constructor
+     *
+     * @param $targetName
+     */
+    public function __construct(string $targetName)
+    {
+        $this->targetName = $targetName;
+    }
+
+    /**
+     * Retrieve button data
+     *
+     * @return array
+     */
+    public function getButtonData(): array
+    {
+        return [
+            'label' => __('Cancel'),
+            'class' => 'cancel',
+            'on_click' => '',
+            'data_attribute' => [
+                'mage-init' => [
+                    'buttonAdapter' => [
+                        'actions' => [
+                            [
+                                'targetName' => $this->targetName,
+                                'actionName' => 'closeModal',
+                                'params' => [
+                                    false,
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+                'form-role' => 'cancel',
+            ],
+            'sort_order' => 90
+        ];
+    }
+}

app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/Close.php renamed to app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CloseButton.php

@@ -7,7 +7,7 @@
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
-class Close implements ButtonProviderInterface
+class CloseButton implements ButtonProviderInterface
 {
     /**
      * @var string

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

@@ -24,6 +24,11 @@ class Map implements RendererInterface
      */
     private $eavAttributeLoader;
 
+    /**
+     * @var array
+     */
+    private $rootElementAttributes;
+
     public function __construct(
         StyleExtractorInterface $styleExtractor,
         EavAttributeLoaderInterface $eavAttributeLoader
@@ -42,26 +47,21 @@ public function render(array $itemData, array $additionalData = [])
         }
         $eavData = $this->eavAttributeLoader->load($itemData['entityId']);
 
-        $rootElementAttributes = [
+        $this->rootElementAttributes = [
             'data-role' => 'map',
             'data-appearance' => 'default',
             'class' => $eavData['css_classes'] ?? '',
             'data-show-controls' => 'true',
-            'data-position' => '{}',
+            'data-locations' => '[]',
         ];
 
-        if (isset($eavData['map'])) {
-            $map = explode(',', $eavData['map']);
-            $rootElementAttributes['data-position'] = '{"lat":'
-                . $map[0]
-                . ',"lng":'
-                . $map[1]
-                . '}';
-        }
+        $this->renderMapLocations($eavData);
 
         if (isset($itemData['formData'])) {
             $formData = $itemData['formData'];
-            $formData['height'] = $eavData['map_height'] ?? '300px';
+            $formData['height'] = $eavData['map_height']
+                && strpos($eavData['map_height'], '%') === false
+                ? $eavData['map_height'] : '300px';
 
             $style = $this->styleExtractor->extractStyle($formData);
             if ($style) {
@@ -70,16 +70,33 @@ public function render(array $itemData, array $additionalData = [])
                 } else {
                     $style .= ' display: none;';
                 }
-                $rootElementAttributes['style'] = $style;
+                $this->rootElementAttributes['style'] = $style;
             }
         }
 
         $rootElementHtml = '<div';
-        foreach ($rootElementAttributes as $attributeName => $attributeValue) {
+        foreach ($this->rootElementAttributes as $attributeName => $attributeValue) {
             $rootElementHtml .= $attributeValue !== '' ? " $attributeName=\"$attributeValue\"" : '';
         }
         $rootElementHtml .= '></div>';
 
         return $rootElementHtml;
     }
+
+    /**
+     * Extract and render Map Location data from EAV
+     *
+     * @param array $eavData
+     */
+    private function renderMapLocations($eavData)
+    {
+        if (isset($eavData['map'])) {
+            $map = explode(',', $eavData['map']);
+            $this->rootElementAttributes['data-locations'] = '[{&quot;position&quot;:{&quot;latitude&quot;:'
+                . $map[0]
+                . ',&quot;longitude&quot;:'
+                . $map[1]
+                . '}}]';
+        }
+    }
 }

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

@@ -637,11 +637,12 @@
     </actionGroup>
     <actionGroup name="saveEditPanelAndValidateFieldErrorGeneralSection">
         <arguments>
+            <argument name="form" defaultValue="PageBuilderActionsSection"/>
             <argument name="property"/>
         </arguments>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-        <waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="waitForColumnSaveButton" />
-        <click selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="clickSaveColumn"/>
+        <waitForElementVisible time="5" selector="{{form.editFormSave}}" stepKey="waitForSaveButton"/>
+        <click selector="{{form.editFormSave}}" stepKey="clickSaveButton"/>
         <waitForElementVisible selector="{{PageBuilderActionsSection.panelFieldValidationError(property.section, property.fieldName)}}" stepKey="waitForErrorField"/>
         <waitForElementVisible selector="{{PageBuilderActionsSection.panelFieldValidationErrorMessage(property.section, property.fieldName, property.errorMessage)}}" stepKey="waitForErrorMessage"/>
     </actionGroup>