Merge branch '1.1-develop' of github.com:magento/magento2-page-builder into bug-287

Author: omiroshnichenko

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # CODEOWNERS file for /docs/ folder.
 # Forces a review from other writers for anything within /docs/.
-/docs/ @magento/devdocs-admins
+/docs/ @bdenham

app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php

@@ -8,6 +8,8 @@
 
 namespace Magento\PageBuilder\Block\Adminhtml\Stage;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\View\Element\Template;
 use Magento\RequireJs\Model\FileManager;
 use Magento\PageBuilder\Model\Stage\Config;
@@ -33,24 +35,32 @@ class Render extends Template
      */
     private $json;
 
+    /**
+     * @var Minification
+     */
+    private $minification;
+
     /**
      * @param Template\Context $context
      * @param FileManager $fileManager
      * @param Config $config
      * @param Json $json
      * @param array $data
+     * @param Minification $minification
      */
     public function __construct(
         Template\Context $context,
         FileManager $fileManager,
         Config $config,
         Json $json,
-        array $data = []
+        array $data = [],
+        Minification $minification = null
     ) {
         parent::__construct($context, $data);
         $this->fileManager = $fileManager;
         $this->pageBuilderConfig = $config;
         $this->json = $json;
+        $this->minification = $minification ?: ObjectManager::getInstance()->get(Minification::class);
     }
 
     /**
@@ -65,6 +75,20 @@ public function getRequireJsUrl() : string
         return $asset->getUrl();
     }
 
+    /**
+     * Generate the URL to the RequireJS min resolver, if minification enabled.
+     *
+     * @return string|null
+     */
+    public function getRequireJsMinUrl() : ?string
+    {
+        if ($this->minification->isEnabled('js')) {
+            $minResolverAsset = $this->fileManager->createMinResolverAsset();
+            return $minResolverAsset->getUrl();
+        }
+        return null;
+    }
+
     /**
      * Retrieve the URL to the RequireJS Config file
      *

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

@@ -47,11 +47,22 @@ public function __construct(
 
     /**
      * Returns config for widgets initializer component.
+     *
      * @return string
      * @api
      */
     public function getConfig() : string
     {
         return $this->jsonSerializer->serialize($this->config->getConfig());
     }
+
+    /**
+     * Returns breakpoints for widgets initializer component.
+     *
+     * @return string
+     */
+    public function getBreakpoints() : string
+    {
+        return $this->jsonSerializer->serialize($this->config->getBreakpoints());
+    }
 }

app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Preview.php

@@ -13,8 +13,6 @@
 
 /**
  * Preview controller to render blocks preview on Stage
- *
- * @api
  */
 class Preview extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {

app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php

@@ -25,24 +25,32 @@ class SimpleOption implements OptionInterface
      */
     private $sortDirection;
 
+    /**
+     * @var string
+     */
+    private $secondarySortDirection;
+
     /**
      * @var string
      */
     private $attributeField;
 
     /**
      * @param string $label
-     * @param string $sortDirection
-     * @param string $attributeField
+     * @param string|null $sortDirection
+     * @param string|null $attributeField
+     * @param string|null $secondarySortDirection
      */
     public function __construct(
         string $label,
-        string $sortDirection,
-        string $attributeField
+        string $sortDirection = null,
+        string $attributeField = null,
+        string $secondarySortDirection = null
     ) {
         $this->label = $label;
         $this->sortDirection = $sortDirection;
         $this->attributeField = $attributeField;
+        $this->secondarySortDirection = $secondarySortDirection ?? $sortDirection;
     }
 
     /**
@@ -51,10 +59,11 @@ public function __construct(
     public function sort(
         \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
     ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
-        $collection->getSelect()->reset(Select::ORDER);
-        $collection->addAttributeToSort($this->attributeField, $this->sortDirection);
-        $collection->addAttributeToSort('entity_id', $this->sortDirection);
-
+        if ($this->attributeField && $this->sortDirection) {
+            $collection->getSelect()->reset(Select::ORDER);
+            $collection->addAttributeToSort($this->attributeField, $this->sortDirection);
+            $collection->addAttributeToSort('entity_id', $this->secondarySortDirection);
+        }
         return $collection;
     }
 

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

@@ -272,8 +272,13 @@ private function generateCssFromImages(string $elementClass, array $images) : st
                 'background-image' => 'url(' . $images['desktop_image'] . ')',
             ];
         }
-        if (isset($images['mobile_image']) && $this->getMobileMediaQuery()) {
-            $css[$this->getMobileMediaQuery()]['.' . $elementClass] = [
+        if (isset($images['mobile_image']) && $this->getMediaQuery('mobile')) {
+            $css[$this->getMediaQuery('mobile')]['.' . $elementClass] = [
+                'background-image' => 'url(' . $images['mobile_image'] . ')',
+            ];
+        }
+        if (isset($images['mobile_image']) && $this->getMediaQuery('mobile-small')) {
+            $css[$this->getMediaQuery('mobile-small')]['.' . $elementClass] = [
                 'background-image' => 'url(' . $images['mobile_image'] . ')',
             ];
         }
@@ -305,13 +310,14 @@ private function cssFromArray(array $css) : string
     /**
      * Generate the mobile media query from view configuration
      *
+     * @param string $view
      * @return null|string
      */
-    private function getMobileMediaQuery() : ?string
+    private function getMediaQuery(string $view) : ?string
     {
         $breakpoints = $this->viewConfig->getViewConfig()->getVarValue(
             'Magento_PageBuilder',
-            'breakpoints/mobile/conditions'
+            'breakpoints/' . $view . '/conditions'
         );
         if ($breakpoints && count($breakpoints) > 0) {
             $mobileBreakpoint = '@media only screen ';

app/code/Magento/PageBuilder/Model/Stage/Config.php

@@ -141,6 +141,7 @@ public function getConfig()
             'column_grid_max' => $this->scopeConfig->getValue(self::XML_PATH_COLUMN_GRID_MAX),
             'can_use_inline_editing_on_stage' => $this->isWysiwygProvisionedForEditingOnStage(),
             'widgets' => $this->widgetInitializerConfig->getConfig(),
+            'breakpoints' => $this->widgetInitializerConfig->getBreakpoints()
         ];
     }
 
@@ -190,13 +191,15 @@ private function getContentTypes()
      */
     private function flattenContentTypeData(string $name, array $contentType)
     {
-        return [
+        $result = [
             'name' => $name,
             'label' => $contentType['label'],
             'icon' => isset($contentType['icon']) ? $contentType['icon'] : '',
             'form' => isset($contentType['form']) ? $contentType['form'] : '',
             'menu_section' => $contentType['menu_section'] ?? 'general',
-            'fields' => isset($contentType['form']) ? $this->uiComponentConfig->getFields($contentType['form']) : [],
+            'fields' => isset($contentType['form'])
+                ? ['default' => $this->uiComponentConfig->getFields($contentType['form'])]
+                : [],
             'component' => $contentType['component'],
             'preview_component' => $contentType['preview_component'] ?? self::DEFAULT_PREVIEW_COMPONENT,
             'master_component' => $contentType['master_component'] ?? self::DEFAULT_MASTER_COMPONENT,
@@ -207,6 +210,14 @@ private function flattenContentTypeData(string $name, array $contentType)
                 : [],
             'is_system' => isset($contentType['is_system']) && $contentType['is_system'] === 'false' ? false : true
         ];
+
+        foreach ($result['appearances'] as $key => $appearance) {
+            if (isset($appearance['form'])) {
+                $result['fields'][$key . '-appearance'] = $this->uiComponentConfig->getFields($appearance['form']);
+            }
+        }
+
+        return $result;
     }
 
     /**

app/code/Magento/PageBuilder/Model/Stage/Config/UiComponentConfig.php

@@ -48,7 +48,10 @@ public function getFields($componentName) : array
             $componentConfig,
             function ($item, $key) {
                 // Determine if this item has a formElement key
-                if (isset($item[Converter::DATA_ARGUMENTS_KEY]['data']['config']['formElement'])) {
+                if (isset($item[Converter::DATA_ARGUMENTS_KEY]['data']['config']['formElement'])
+                    && !(isset($item[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentDisabled'])
+                        && $item[Converter::DATA_ARGUMENTS_KEY]['data']['config']['componentDisabled'] === true)
+                ) {
                     $elementConfig = $item[Converter::DATA_ARGUMENTS_KEY]['data']['config'];
                     // If the field has a dataScope use that for the key instead of the name
                     if (isset($elementConfig['dataScope'])) {

app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php

@@ -8,6 +8,9 @@
 
 namespace Magento\PageBuilder\Model;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\ConfigInterface;
+
 /**
  * Container for the configuration related to the widget initializer mechanism
  */
@@ -18,12 +21,21 @@ class WidgetInitializerConfig
      */
     private $config;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $viewConfig;
+
     /**
      * @param array $config
+     * @param ConfigInterface|null $viewConfig
      */
-    public function __construct(array $config)
-    {
+    public function __construct(
+        array $config,
+        ConfigInterface $viewConfig = null
+    ) {
         $this->config = $config;
+        $this->viewConfig = $viewConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
     }
 
     /**
@@ -43,10 +55,23 @@ public function getConfig(): array
                 if (isset($item['appearance'])) {
                     $selector .= sprintf('[data-appearance="%s"]', $item['appearance']);
                 }
-                $componentConfig = isset($item['config']) ? $item['config'] : '{}';
+                $componentConfig = isset($item['config']) ? $item['config'] : false;
                 $resultConfig[$selector][$item['component']] = $componentConfig;
             }
         }
         return $resultConfig;
     }
+
+    /**
+     * Returns breakpoint for widgets initializer component.
+     *
+     * @return array
+     */
+    public function getBreakpoints(): array
+    {
+        return $this->viewConfig->getViewConfig()->getVarValue(
+            'Magento_PageBuilder',
+            'breakpoints'
+        );
+    }
 }

app/code/Magento/PageBuilder/Plugin/Catalog/Block/Product/ProductsListPlugin.php

@@ -9,7 +9,10 @@
 namespace Magento\PageBuilder\Plugin\Catalog\Block\Product;
 
 use Magento\PageBuilder\Model\Catalog\Sorting;
+use Magento\Catalog\Model\Category;
 use Magento\CatalogInventory\Helper\Stock;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Catalog Products List widget block plugin
@@ -26,16 +29,24 @@ class ProductsListPlugin
      */
     private $stock;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param Sorting $sorting
      * @param Stock $stock
+     * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
         Sorting $sorting,
-        Stock $stock
+        Stock $stock,
+        CategoryRepositoryInterface $categoryRepository
     ) {
         $this->sorting = $sorting;
         $this->stock = $stock;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -49,12 +60,25 @@ public function afterCreateCollection(
         \Magento\CatalogWidget\Block\Product\ProductsList $subject,
         \Magento\Catalog\Model\ResourceModel\Product\Collection $result
     ) {
-        $this->stock->addIsInStockFilterToCollection($result);
+        $conditionOption = $subject->getData('condition_option');
+        $categoryId = $conditionOption === 'category_ids' ? $subject->getData('condition_option_value') : null;
         $sortOption = $subject->getData('sort_order');
-        if (isset($sortOption)) {
-            $sortedResult = $this->sorting->applySorting($sortOption, $result);
 
-            return $sortedResult;
+        $this->stock->addIsInStockFilterToCollection($result);
+
+        if (!empty($categoryId)) {
+            try {
+                $category = $this->categoryRepository->get($categoryId);
+            } catch (NoSuchEntityException $noEntityException) {
+                $category = null;
+            }
+            if ($category) {
+                $result->addCategoryFilter($category);
+            }
+        }
+
+        if (!empty($sortOption)) {
+            return $this->sorting->applySorting($sortOption, $result);
         } else {
             return $result;
         }
@@ -70,6 +94,26 @@ public function afterCreateCollection(
     public function afterGetCacheKeyInfo(\Magento\CatalogWidget\Block\Product\ProductsList $subject, array $cacheKeys)
     {
         $cacheKeys[] = $subject->getData('sort_order');
+        $cacheKeys[] = $subject->getData('condition_option');
         return $cacheKeys;
     }
+
+    /**
+     * Add category cache identifier
+     *
+     * @param \Magento\CatalogWidget\Block\Product\ProductsList $subject
+     * @param array $result
+     * @return array
+     */
+    public function afterGetIdentities(\Magento\CatalogWidget\Block\Product\ProductsList $subject, array $result)
+    {
+        $conditionOption = $subject->getData('condition_option');
+        $categoryId = $conditionOption === 'category_ids' ? $subject->getData('condition_option_value') : null;
+        $sortOption = $subject->getData('sort_order');
+
+        if (!empty($categoryId) && $sortOption === 'position') {
+            $result[] = Category::CACHE_TAG . '_' . $categoryId;
+        }
+        return $result;
+    }
 }