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

Author: omiroshnichenko

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,37 @@
+## Scope
+### Story
+<!--- 
+* [<issue_number>](https://jira.corp.magento.com/browse/<issue_number>) <issue_title>
+-->
+
+### Bug
+<!--- 
+* [<issue_number>](https://jira.corp.magento.com/browse/<issue_number>) <issue_title>
+-->
+
+### Task
+<!--- 
+* [<issue_number>](https://jira.corp.magento.com/browse/<issue_number>) <issue_title>
+-->
+
+### Builds
+<!--- 
+[All-User-Requested-Tests](https://m2build-ur.devops.magento.com/job/All-User-Requested-Tests/<build_number>)
+-->
+
+### Related Pull Requests
+<!--- 
+https://github.com/magento/magento2ce/pull/<related_pr>
+-->
+<!-- related pull request placeholder -->
+
+### Checklist
+- [ ] PR is green on M2 Quality Portal
+- [ ] Jira issues have accurate summary, meaningful description and have links to relevant documentation at the story/task level
+- [ ] Semantic Version build failure is approved by architect (if build is red) <Architect Name>
+- [ ] Pull Request approved by architect <Architect Name>
+- [ ] Pull Request quality review performed by <name>
+- [ ] All unstable functional acceptance tests are isolated (if any)
+- [ ] All linked Zephyr tests are approved by PO and have Ready to Use status
+- [ ] Travis CI build is green (for mainline CE only)
+- [ ] Jenkins Extended FAT build is green

.stylelintrc

@@ -20,6 +20,7 @@
         "selector-combinator-space-before": "always",
         "selector-list-comma-newline-after": "always",
         "shorthand-property-no-redundant-values": true,
-        "string-quotes": "single"
+        "string-quotes": "single",
+        "function-calc-no-invalid": null
     }
 }

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

@@ -17,6 +17,8 @@
 
 /**
  * Class Render
+ *
+ * @api
  */
 class Render extends Template
 {

app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Controller\Adminhtml\Form\Element;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+
+/**
+ * Returns the number of products that match the provided conditions
+ */
+class ProductTotals extends Action implements HttpPostActionInterface
+{
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
+
+    /**
+     * @var \Magento\PageBuilder\Model\Catalog\ProductTotals
+     */
+    private $productTotals;
+
+    /**
+     * @var JsonFactory
+     */
+    private $jsonFactory;
+
+    /**
+     * @param Context $context
+     * @param \Magento\PageBuilder\Model\Catalog\ProductTotals $productTotals
+     * @param JsonFactory $jsonFactory
+     */
+    public function __construct(
+        Context $context,
+        \Magento\PageBuilder\Model\Catalog\ProductTotals $productTotals,
+        JsonFactory $jsonFactory
+    ) {
+        $this->jsonFactory = $jsonFactory;
+        $this->productTotals = $productTotals;
+        parent::__construct($context);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        $conditions = $this->getRequest()->getParam('conditionValue');
+
+        try {
+            $totals = $this->productTotals->getProductTotals($conditions);
+            $response = [
+                'total' => $totals['total'],
+                'disabled' => $totals['disabled'],
+                'notVisible' => $totals['notVisible'],
+                'outOfStock' => $totals['outOfStock'],
+            ];
+        } catch (Exception $e) {
+            $response = [
+                'total' => 0,
+                'disabled' => 0,
+                'notVisible' => 0,
+                'outOfStock' => 0,
+            ];
+        }
+
+        return $this->jsonFactory->create()->setData($response);
+    }
+}

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

@@ -7,8 +7,9 @@
 
 namespace Magento\PageBuilder\Controller\Adminhtml\Stage;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\RequireJs\Block\Html\Head\Config;
+use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Class Render
@@ -20,30 +21,31 @@ class Render extends \Magento\Backend\App\Action implements HttpGetActionInterfa
     const ADMIN_RESOURCE = 'Magento_Backend::content';
 
     /**
-     * Render the RequireJS and Page Builder render blocks without any additional layout
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * Render constructor.
+     *
+     * @param Context $context
+     * @param PageFactory $pageFactory
+     */
+    public function __construct(
+        Context $context,
+        PageFactory $pageFactory
+    ) {
+        $this->pageFactory = $pageFactory;
+        return parent::__construct($context);
+    }
+
+    /**
+     * Render route
      *
-     * @return void
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface|mixed
      */
     public function execute()
     {
-        $layout = $this->_view->getLayout();
-        $requireJs = $layout->createBlock(
-            \Magento\Backend\Block\Page\RequireJs::class,
-            'require.js'
-        );
-        $requireJs->setTemplate('Magento_Backend::page/js/require_js.phtml');
-        /* @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $renderBlock */
-        $renderBlock = $layout->createBlock(
-            \Magento\PageBuilder\Block\Adminhtml\Stage\Render::class,
-            'stage_render'
-        );
-        $renderBlock->setTemplate('Magento_PageBuilder::stage/render.phtml');
-        $babelPolyfill = $layout->createBlock(
-            \Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill::class,
-            'pagebuilder.babel.polyfill'
-        );
-        $babelPolyfill->setTemplate('Magento_PageBuilder::html/head/babel_polyfill.phtml');
-        $this->getResponse()->setBody($requireJs->toHtml() . $babelPolyfill->toHtml() . $renderBlock->toHtml());
-        $this->getResponse()->sendResponse();
+        return $this->pageFactory->create();
     }
 }