fix(adminhtml): fetch current category in category edit page

Author: damcou

Block/Adminhtml/Category/Merchandising.php

@@ -6,15 +6,15 @@
 use Algolia\AlgoliaSearch\Helper\Data;
 use Magento\Backend\Block\Template\Context;
 use Magento\Catalog\Model\Category;
-use Algolia\AlgoliaSearch\Registry\CurrentCategory;
+use Algolia\AlgoliaSearch\Service\GetCurrentCategoryService;
 
 class Merchandising extends \Magento\Backend\Block\Template
 {
     /** @var string */
     protected $_template = 'catalog/category/edit/merchandising.phtml';
 
-    /** @var CurrentCategory */
-    protected $currentCategory;
+    /** @var GetCurrentCategoryService */
+    protected $getCurrentCategoryService;
 
     /** @var ConfigHelper */
     private $configHelper;
@@ -27,19 +27,19 @@ class Merchandising extends \Magento\Backend\Block\Template
 
     /**
      * @param Context $context
-     * @param CurrentCategory $currentCategory
+     * @param GetCurrentCategoryService $getCurrentCategoryService
      * @param ConfigHelper $configHelper
      * @param Data $coreHelper
      * @param array $data
      */
     public function __construct(
         Context $context,
-        CurrentCategory $currentCategory,
+        GetCurrentCategoryService $getCurrentCategoryService,
         ConfigHelper $configHelper,
         Data $coreHelper,
         array $data = []
     ) {
-        $this->currentCategory = $currentCategory;
+        $this->getCurrentCategoryService = $getCurrentCategoryService;
         $this->configHelper = $configHelper;
         $this->coreHelper = $coreHelper;
         $this->storeManager = $context->getStoreManager();
@@ -50,7 +50,11 @@ public function __construct(
     /** @return Category | null */
     public function getCategory()
     {
-        return $this->currentCategory->get();
+        $categoryId = $this->getRequest()->getParam('id');
+        if (!$categoryId) {
+            return null;
+        }
+        return $this->getCurrentCategoryService->getCategory($categoryId);
     }
 
     /** @return bool */

Service/GetCurrentCategoryService.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Service;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class GetCurrentCategoryService
+{
+    /**
+     * Current Category
+     *
+     * @var CategoryInterface
+     */
+    private $currentCategory;
+
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    /**
+     * @param CategoryRepositoryInterface $categoryRepository
+     */
+    public function __construct(
+        CategoryRepositoryInterface $categoryRepository
+    ) {
+        $this->categoryRepository = $categoryRepository;
+    }
+
+    /**
+     * @param int $categoryId
+     * @return CategoryInterface|null
+     */
+    public function getCategory(int $categoryId): ?CategoryInterface
+    {
+        if (!$this->currentCategory) {
+            try {
+                $this->currentCategory = $this->categoryRepository->get($categoryId);
+            } catch (NoSuchEntityException $e) {
+                return null;
+            }
+        }
+        return $this->currentCategory;
+    }
+}

etc/adminhtml/events.xml

@@ -65,7 +65,4 @@
     <event name="sales_order_shipment_save_after">
         <observer name="algoliasearch_reindex_product_on_last_item_purchase" instance="Algolia\AlgoliaSearch\Observer\ReindexProductOnLastItemPurchase"/>
     </event>
-    <event name="catalog_controller_category_init_after">
-        <observer name="algoliasearch_current_category" instance="Algolia\AlgoliaSearch\Observer\RegisterCurrentCategoryObserver"/>
-    </event>
 </config>