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

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

Author: avattam06

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

@@ -9,35 +9,48 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Message\MessageInterface;
-use Magento\Framework\View\DesignLoader as ViewDesignLoader;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Catalog\Block\Product\ImageFactory;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\State;
 
 /**
  * Load necessary design files for GraphQL
  */
 class DesignLoader
 {
     /**
-     * @var DesignLoader
+     * @var ManagerInterface
      */
-    private $designLoader;
+    private $messageManager;
 
     /**
-     * @var ManagerInterface
+     * Application arealist
+     *
+     * @var AreaList
      */
-    private $messageManager;
+    private $areaList;
+
+    /**
+     * Application State
+     *
+     * @var State
+     */
+    private $appState;
 
     /**
-     * @param ViewDesignLoader $designLoader
      * @param ManagerInterface $messageManager
+     * @param AreaList $areaList
+     * @param State $appState
      */
     public function __construct(
-        ViewDesignLoader $designLoader,
-        ManagerInterface $messageManager
+        ManagerInterface $messageManager,
+        AreaList $areaList,
+        State $appState
     ) {
-        $this->designLoader = $designLoader;
         $this->messageManager = $messageManager;
+        $this->areaList = $areaList;
+        $this->appState = $appState;
     }
 
     /**
@@ -57,7 +70,8 @@ public function beforeCreate(
         array $attributes = null
     ) {
         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 */