Merge pull request #171 from magento-arcticfoxes/B2B-2221

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

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;
 
 /**
@@ -16,17 +19,21 @@
 class DesignLoader
 {
     /**
-     * @var \Magento\Framework\View\DesignLoader
+     * @var ManagerInterface
      */
-    private $designLoader;
+    private $messageManager;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface
+     * Application arealist
+     *
+     * @var AreaList
      */
-    private $messageManager;
+    private $areaList;
 
     /**
-     * @var \Magento\Framework\App\State
+     * Application State
+     *
+     * @var State
      */
     private $appState;
 
@@ -36,21 +43,21 @@ class DesignLoader
     private $preview;
 
     /**
-     * @param \Magento\Framework\View\DesignLoader $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 +91,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 */