MC-41534: [On-Premise] Product themes don't apply as expected

Author: tsviklinskyi

app/code/Magento/Catalog/Controller/Product/View.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Controller\Product;
 
-use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Design;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
@@ -65,11 +64,6 @@ class View extends ProductAction implements HttpGetActionInterface, HttpPostActi
      */
     private $productRepository;
 
-    /**
-     * @var CategoryRepositoryInterface
-     */
-    private $categoryRepository;
-
     /**
      * @var StoreManagerInterface
      */
@@ -86,7 +80,6 @@ class View extends ProductAction implements HttpGetActionInterface, HttpPostActi
      * @param Data|null $jsonHelper
      * @param Design|null $catalogDesign
      * @param ProductRepositoryInterface|null $productRepository
-     * @param CategoryRepositoryInterface|null $categoryRepository
      * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
@@ -98,7 +91,6 @@ public function __construct(
         ?Data $jsonHelper = null,
         ?Design $catalogDesign = null,
         ?ProductRepositoryInterface $productRepository = null,
-        ?CategoryRepositoryInterface $categoryRepository = null,
         ?StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($context);
@@ -113,8 +105,6 @@ public function __construct(
             ->get(Design::class);
         $this->productRepository = $productRepository ?: ObjectManager::getInstance()
             ->get(ProductRepositoryInterface::class);
-        $this->categoryRepository = $categoryRepository ?: ObjectManager::getInstance()
-            ->get(CategoryRepositoryInterface::class);
         $this->storeManager = $storeManager ?: ObjectManager::getInstance()
             ->get(StoreManagerInterface::class);
     }
@@ -206,17 +196,9 @@ public function execute()
     private function applyCustomDesign(int $productId): void
     {
         $product = $this->productRepository->getById($productId, false, $this->storeManager->getStore()->getId());
-        $productSettings = $this->catalogDesign->getDesignSettings($product);
-        if ($productSettings->getCustomDesign()) {
-            $this->catalogDesign->applyCustomDesign($productSettings->getCustomDesign());
-        } else {
-            foreach ($product->getCategoryIds() as $categoryId) {
-                $category = $this->categoryRepository->get($categoryId, $this->storeManager->getStore()->getId());
-                $categorySettings = $this->catalogDesign->getDesignSettings($category);
-                if ($categorySettings->getCustomDesign()) {
-                    $this->catalogDesign->applyCustomDesign($categorySettings->getCustomDesign());
-                }
-            }
+        $settings = $this->catalogDesign->getDesignSettings($product);
+        if ($settings->getCustomDesign()) {
+            $this->catalogDesign->applyCustomDesign($settings->getCustomDesign());
         }
     }
 }

app/code/Magento/Catalog/Model/Design.php

@@ -6,11 +6,13 @@
 
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager as CategoryLayoutManager;
 use Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager as ProductLayoutManager;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Registry;
@@ -60,6 +62,16 @@ class Design extends \Magento\Framework\Model\AbstractModel
      */
     private $productLayoutUpdates;
 
+    /**
+     * @var Session
+     */
+    private $catalogSession;
+
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param Context $context
      * @param Registry $registry
@@ -71,6 +83,8 @@ class Design extends \Magento\Framework\Model\AbstractModel
      * @param TranslateInterface|null $translator
      * @param CategoryLayoutManager|null $categoryLayoutManager
      * @param ProductLayoutManager|null $productLayoutManager
+     * @param Session|null $catalogSession
+     * @param CategoryRepositoryInterface|null $categoryRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -83,7 +97,9 @@ public function __construct(
         array $data = [],
         TranslateInterface $translator = null,
         ?CategoryLayoutManager $categoryLayoutManager = null,
-        ?ProductLayoutManager $productLayoutManager = null
+        ?ProductLayoutManager $productLayoutManager = null,
+        ?Session $catalogSession = null,
+        ?CategoryRepositoryInterface $categoryRepository = null
     ) {
         $this->_localeDate = $localeDate;
         $this->_design = $design;
@@ -92,6 +108,10 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(CategoryLayoutManager::class);
         $this->productLayoutUpdates = $productLayoutManager
             ?? ObjectManager::getInstance()->get(ProductLayoutManager::class);
+        $this->catalogSession = $catalogSession
+            ?? ObjectManager::getInstance()->get(Session::class);
+        $this->categoryRepository = $categoryRepository
+            ?? ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -118,6 +138,17 @@ public function getDesignSettings($object)
     {
         if ($object instanceof Product) {
             $currentCategory = $object->getCategory();
+            if (!$currentCategory) {
+                $lastId = $this->catalogSession->getLastVisitedCategoryId();
+                if ($object->canBeShowInCategory($lastId)) {
+                    $categoryId = $lastId;
+                    try {
+                        $currentCategory = $this->categoryRepository->get($categoryId);
+                    } catch (NoSuchEntityException $e) {
+                        $currentCategory = null;
+                    }
+                }
+            }
         } else {
             $currentCategory = $object;
         }

app/code/Magento/Catalog/Test/Unit/Controller/Product/ViewTest.php

@@ -7,12 +7,11 @@
 
 namespace Magento\Catalog\Test\Unit\Controller\Product;
 
-use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Controller\Product\View;
 use Magento\Catalog\Helper\Product\View as ViewHelper;
 use Magento\Catalog\Model\Design;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\ForwardFactory;
@@ -50,15 +49,10 @@ class ViewTest extends TestCase
     private $catalogDesignMock;
 
     /**
-     * @var ProductRepositoryInterface|MockObject
+     * @var ProductRepository|MockObject
      */
     private $productRepositoryMock;
 
-    /**
-     * @var CategoryRepositoryInterface|MockObject
-     */
-    private $categoryRepositoryMock;
-
     /**
      * @var ProductInterface|MockObject
      */
@@ -99,8 +93,9 @@ protected function setUp(): void
         $this->catalogDesignMock = $this->getMockBuilder(Design::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->productRepositoryMock = $this->getMockForAbstractClass(ProductRepositoryInterface::class);
-        $this->categoryRepositoryMock = $this->getMockForAbstractClass(CategoryRepositoryInterface::class);
+        $this->productRepositoryMock = $this->getMockBuilder(ProductRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->productInterfaceMock = $this->getMockBuilder(ProductInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -117,7 +112,6 @@ protected function setUp(): void
             null,
             $this->catalogDesignMock,
             $this->productRepositoryMock,
-            $this->categoryRepositoryMock,
             $this->storeManagerMock
         );
     }