Merge branch 'MC-3945-tab-height' into team3-bugs

Author: nathanjosiah

app/code/Magento/PageBuilder/Block/Catalog/Block/Product/View/Attributes.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Block\Catalog\Block\Product\View;
+
+class Attributes extends \Magento\Catalog\Block\Product\View\Attributes
+{
+    const DISPLAY_ATTRIBUTES_NON_PAGEBUILDER = 'non_pagebuilder';
+
+    const DISPLAY_ATTRIBUTES_PAGEBUILDER_ONLY = 'pagebuilder_only';
+
+    /**
+     * Determine if we should display the attribute on the front-end, add support for exclude page builder & page
+     * builder only options on class.
+     *
+     * display_attributes can be set to determine whether to include just Page Builder attributes or to exclude
+     * them.
+     *
+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
+     * @param array $excludeAttr
+     * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function isVisibleOnFrontend(
+        \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
+        array $excludeAttr
+    ) : bool {
+        return parent::isVisibleOnFrontend($attribute, $excludeAttr)
+            && (($this->getDisplayAttributes() == self::DISPLAY_ATTRIBUTES_NON_PAGEBUILDER
+                    && !$attribute->getIsPagebuilderEnabled())
+            || ($this->getDisplayAttributes() == self::DISPLAY_ATTRIBUTES_PAGEBUILDER_ONLY
+                    && $attribute->getIsPagebuilderEnabled()));
+    }
+}

app/code/Magento/PageBuilder/Block/WidgetInitializer.php

@@ -22,18 +22,26 @@ class WidgetInitializer extends Template
      */
     private $jsonSerializer;
 
+    /**
+     * @var \Magento\PageBuilder\Model\WidgetInitializerConfig
+     */
+    private $config;
+
     /**
      * WidgetInitializer constructor.
      * @param Template\Context $context
      * @param \Magento\Framework\Serialize\Serializer\Json $jsonEncoder
+     * @param \Magento\PageBuilder\Model\WidgetInitializerConfig $config
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Serialize\Serializer\Json $jsonEncoder,
+        \Magento\PageBuilder\Model\WidgetInitializerConfig $config,
         array $data = []
     ) {
         $this->jsonSerializer = $jsonEncoder;
+        $this->config = $config;
         parent::__construct($context, $data);
     }
 
@@ -44,21 +52,6 @@ public function __construct(
      */
     public function getConfig() : string
     {
-        $widgetsConfig = $this->getData('config');
-        $resultConfig = [];
-        foreach ($widgetsConfig as $contentTypeName => $config) {
-            $selector = sprintf('div[data-role="%s"]', $contentTypeName);
-            foreach ($config as $item) {
-                if (!isset($item['component'])) {
-                    continue;
-                }
-                if (isset($item['appearance'])) {
-                    $selector .= sprintf('[data-appearance="%s"]', $item['appearance']);
-                }
-                $componentConfig = isset($item['config']) ? $item['config'] : '{}';
-                $resultConfig[$selector] = [$item['component'] => $componentConfig];
-            }
-        }
-        return $this->jsonSerializer->serialize($resultConfig);
+        return $this->jsonSerializer->serialize($this->config->getConfig());
     }
 }

app/code/Magento/PageBuilder/Block/WysiwygSetup.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Block;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\DataObject;
+
+/**
+ * @api
+ */
+class WysiwygSetup extends Template
+{
+    /**
+     * @var \Magento\Ui\Component\Wysiwyg\ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param Template\Context $context
+     * @param \Magento\Ui\Component\Wysiwyg\ConfigInterface $config
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Ui\Component\Wysiwyg\ConfigInterface $config,
+        array $data = []
+    ) {
+        $this->config = $config;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Get config for wysiwyg initialization
+     *
+     * @return string
+     */
+    public function getConfigJson() : string
+    {
+        $config = $this->config->getConfig();
+
+        if (is_array($config)) {
+            $config = new DataObject($config);
+        }
+
+        return $config->toJson();
+    }
+}

app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php

@@ -36,6 +36,11 @@ class Upload extends \Magento\Backend\App\Action
      */
     private $storeManager;
 
+    /**
+     * @var \Magento\Cms\Helper\Wysiwyg\Images
+     */
+    private $cmsWysiwygImages;
+
     /**
      * Constructor
      *
@@ -44,19 +49,22 @@ class Upload extends \Magento\Backend\App\Action
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\File\UploaderFactory $uploaderFactory
      * @param \Magento\Framework\Filesystem\DirectoryList $directoryList
+     * @param \Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\File\UploaderFactory $uploaderFactory,
-        \Magento\Framework\Filesystem\DirectoryList $directoryList
+        \Magento\Framework\Filesystem\DirectoryList $directoryList,
+        \Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages
     ) {
         parent::__construct($context);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->storeManager = $storeManager;
         $this->uploaderFactory = $uploaderFactory;
         $this->directoryList = $directoryList;
+        $this->cmsWysiwygImages = $cmsWysiwygImages;
     }
 
     /**
@@ -89,6 +97,7 @@ public function execute()
         try {
             $result = $fileUploader->save($this->getUploadDir());
             $baseUrl = $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
+            $result['id'] = $this->cmsWysiwygImages->idEncode($result['file']);
             $result['url'] = $baseUrl . $this->getFilePath(self::UPLOAD_DIR, $result['file']);
         } catch (\Exception $e) {
             $result = [

app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg;
+
+use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
+
+/**
+ * Returns adapter config based on active editor path
+ */
+class Config implements ProviderInterface
+{
+    /**
+     * @var \Magento\Cms\Model\Wysiwyg\Config
+     */
+    private $wysiwygConfig;
+
+    /**
+     * @var \Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList
+     */
+    private $inlineEditingChecker;
+
+    /**
+     * @var \Magento\Ui\Block\Wysiwyg\ActiveEditor
+     */
+    private $activeEditor;
+
+    /**
+     * @var array
+     */
+    private $editors;
+
+    /**
+     * Config constructor.
+     * @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
+     * @param \Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList $inlineEditingChecker
+     * @param \Magento\Ui\Block\Wysiwyg\ActiveEditor $activeEditor
+     * @param array $editors
+     */
+    public function __construct(
+        \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig,
+        \Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList $inlineEditingChecker,
+        \Magento\Ui\Block\Wysiwyg\ActiveEditor $activeEditor,
+        $editors = []
+    ) {
+        $this->wysiwygConfig = $wysiwygConfig;
+        $this->inlineEditingChecker = $inlineEditingChecker;
+        $this->activeEditor = $activeEditor;
+        $this->editors = $editors;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(string $itemName) : array
+    {
+        $config = [];
+        $activeEditorPath = $this->activeEditor->getWysiwygAdapterPath();
+        if ($this->inlineEditingChecker->isSupported($activeEditorPath)) {
+            $config['adapter'] = $this->wysiwygConfig->getConfig()->getData();
+            if (isset($this->editors[$activeEditorPath])) {
+                $config['adapter_config'] = $this->editors[$activeEditorPath];
+            }
+        }
+        return [$itemName => $config,];
+    }
+}