B2B-2221: Magento\CatalogGraphQl\Plugin\DesignLoader plugin loads too much data

- Designloader Plugin changes areadded

Author: avattam06

app/code/Magento/PageBuilder/Plugin/DesignLoader.php

@@ -8,6 +8,9 @@
 namespace Magento\PageBuilder\Plugin;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\State;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Message\MessageInterface;
 
 /**
@@ -21,14 +24,23 @@ class DesignLoader
     private $designLoader;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface
+     * @var ManagerInterface
      */
-    private $messageManager;
+    private ManagerInterface $messageManager;
 
     /**
-     * @var \Magento\Framework\App\State
+     * Application
+     *
+     * @var AreaList
+     */
+    private AreaList $areaList;
+
+    /**
+     * Layout
+     *
+     * @var State
      */
-    private $appState;
+    private State $appState;
 
     /**
      * @var \Magento\PageBuilder\Model\Stage\Preview
@@ -40,17 +52,20 @@ class DesignLoader
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\PageBuilder\Model\Stage\Preview $preview
+     * @param AreaList $areaList
      */
     public function __construct(
         \Magento\Framework\View\DesignLoader $designLoader,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Framework\App\State $appState,
-        \Magento\PageBuilder\Model\Stage\Preview $preview
+        \Magento\PageBuilder\Model\Stage\Preview $preview,
+        AreaList $areaList,
     ) {
         $this->designLoader = $designLoader;
         $this->messageManager = $messageManager;
         $this->appState = $appState;
         $this->preview = $preview;
+        $this->areaList = $areaList;
     }
 
     /**
@@ -84,7 +99,8 @@ public function beforeCreate(
     public function loadDesignConfig()
     {
         try {
-            $this->designLoader->load();
+            $area = $this->areaList->getArea($this->appState->getAreaCode());
+            $area->load(\Magento\Framework\App\Area::PART_DESIGN);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             if ($e->getPrevious() instanceof \Magento\Framework\Config\Dom\ValidationException) {
                 /** @var MessageInterface $message */

app/code/Magento/PageBuilder/etc/adminhtml/di.xml

@@ -9,6 +9,9 @@
     <preference for="Magento\PageBuilder\Api\TemplateRepositoryInterface" type="Magento\PageBuilder\Model\TemplateRepository"/>
     <preference for="Magento\PageBuilder\Api\Data\TemplateInterface" type="Magento\PageBuilder\Model\Template"/>
     <preference for="Magento\PageBuilder\Api\Data\TemplateSearchResultsInterface" type="Magento\Framework\Api\SearchResults"/>
+    <type name="Magento\Catalog\Block\Product\ImageFactory">
+        <plugin name="designLoader" type="Magento\PageBuilder\Plugin\DesignLoader" />
+    </type>
     <virtualType name="Magento\PageBuilder\Block\Adminhtml\ContentType\Edit\ModalCloseButton" type="Magento\PageBuilder\Block\Adminhtml\ContentType\Edit\CloseButton">
         <arguments>
             <argument name="targetName" xsi:type="string">ns = pagebuilder_modal_form, index = modal</argument>