Merge pull request #114 from magento-l3/PR-2021-20-08

Pr 2021 20 09
magento · Sep 27, 2021 · f223e97 · f223e97
2 parents abbc720 + c52e73a
commit f223e97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php
@@ -9,17 +9,16 @@
 namespace Magento\PageBuilder\Controller\Adminhtml\Form\Element;
 
 use Exception;
-use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
+use Magento\CatalogWidget\Controller\Adminhtml\Product\Widget;
 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
+class ProductTotals extends Widget implements HttpPostActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
      * @var \Magento\PageBuilder\Model\Catalog\ProductTotals

diff --git a/...Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml b/...Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml
@@ -18,6 +18,7 @@
         <element name="panelFieldLabel" type="text" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::div[@data-index=&quot;{{arg2}}&quot;]/descendant::label[not(contains(@style,&quot;display: none;&quot;))] | //aside//div[@data-index=&quot;{{arg3}}&quot;]/descendant::*[@class=&quot;admin__field-label&quot; or @class=&quot;title&quot;]/descendant::span[text()=&quot;{{arg4}}&quot;][not(ancestor::legend)]" parameterized="true"/>
         <element name="panelSectionChangedIcon" type="text" selector="[data-index='{{arg1}}'] ._changed .admin__page-nav-item-message-icon" parameterized="true"/>
         <element name="panelSectionError" type="text" selector="[data-index='{{arg1}}'] span._error .admin__page-nav-item-message-icon" parameterized="true"/>
+        <element name="panelSectionGenericError" type="text" selector="div.message.message-error.error"/>
         <element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
         <element name="panelFieldControlCheckbox" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}']" parameterized="true"/>
         <element name="panelFieldControlCheckboxState" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}' and @value='{{arg2}}']" parameterized="true"/>