Merge branch '1.1-develop' into MC-18071

Author: nikita-shcherbatykh

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

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Controller\Adminhtml\Stage;
+
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Preview controller to render blocks preview on Stage
+ */
+class Preview extends \Magento\Backend\App\Action implements HttpPostActionInterface
+{
+    const ADMIN_RESOURCE = 'Magento_Backend::content';
+
+    /**
+     * @var \Magento\PageBuilder\Model\Stage\RendererPool
+     */
+    private $rendererPool;
+
+    /**
+     * @var \Magento\PageBuilder\Model\Stage\Preview
+     */
+    private $preview;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool
+     * @param \Magento\PageBuilder\Model\Stage\Preview $preview
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool,
+        \Magento\PageBuilder\Model\Stage\Preview $preview
+    ) {
+        parent::__construct($context);
+
+        $this->rendererPool = $rendererPool;
+        $this->preview = $preview;
+    }
+
+    /**
+     * Generates an HTML preview for the stage
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|mixed
+     * @throws \Exception
+     */
+    public function execute()
+    {
+        return $this->preview->startPreviewMode(
+            function () {
+                $pageResult = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+                // Some template filters and directive processors expect this to be called in order to function.
+                $pageResult->initLayout();
+
+                $params = $this->getRequest()->getParams();
+                $renderer = $this->rendererPool->getRenderer($params['role']);
+                $result = ['data' => $renderer->render($params)];
+
+                return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
+            }
+        );
+    }
+}

app/code/Magento/PageBuilder/Controller/ContentType/Preview.php

@@ -17,6 +17,8 @@
  * This isn't placed within the adminhtml folder as it has to extend from the front-end controllers app action to
  * ensure the content is rendered in the storefront scope.
  *
+ * @deprecated use \Magento\PageBuilder\Controller\Adminhtml\Stage\Preview
+ *
  * @api
  */
 class Preview extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface

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

@@ -25,6 +25,11 @@ class SimpleOption implements OptionInterface
      */
     private $sortDirection;
 
+    /**
+     * @var string
+     */
+    private $secondarySortDirection;
+
     /**
      * @var string
      */
@@ -34,15 +39,18 @@ class SimpleOption implements OptionInterface
      * @param string $label
      * @param string $sortDirection
      * @param string $attributeField
+     * @param string|null $secondarySortDirection
      */
     public function __construct(
         string $label,
         string $sortDirection,
-        string $attributeField
+        string $attributeField,
+        string $secondarySortDirection = null
     ) {
         $this->label = $label;
         $this->sortDirection = $sortDirection;
         $this->attributeField = $attributeField;
+        $this->secondarySortDirection = $secondarySortDirection ?? $sortDirection;
     }
 
     /**
@@ -53,7 +61,7 @@ public function sort(
     ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
         $collection->getSelect()->reset(Select::ORDER);
         $collection->addAttributeToSort($this->attributeField, $this->sortDirection);
-        $collection->addAttributeToSort('entity_id', $this->sortDirection);
+        $collection->addAttributeToSort('entity_id', $this->secondarySortDirection);
 
         return $collection;
     }