Merge pull request #1517 from algolia/bugfix/MAGE-929

Bugfix/MAGE-929

Author: cammonro

Helper/Entity/Product/PriceManager/ProductWithoutChildren.php

@@ -380,7 +380,7 @@ protected function addTierPrices($tierPrice, $field, $currencyCode)
                 $this->formatPrice($tierPrice[0], $currencyCode);
         }
     }
-    # TODO bookmarking getRulePrice function for a future refactor effort.
+    // TODO bookmarking getRulePrice function for a future refactor effort.
     /**
      * @param $groupId
      * @param $product

Plugin/SetAdminCurrentCategory.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Plugin;
+
+use Algolia\AlgoliaSearch\Registry\CurrentCategory;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Controller\Adminhtml\Category\Edit as EditController;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Result\Page;
+
+class SetAdminCurrentCategory
+{
+    /** @var CurrentCategory */
+    protected $currentCategory;
+
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    /**
+     * @param CurrentCategory $currentCategory
+     * @param CategoryRepositoryInterface $categoryRepository
+     */
+    public function __construct(
+        CurrentCategory $currentCategory,
+        CategoryRepositoryInterface $categoryRepository
+    ) {
+        $this->currentCategory = $currentCategory;
+        $this->categoryRepository = $categoryRepository;
+    }
+
+    /**
+     * Set the current category in adminhtml area in the Algolia registry without using Magento registry
+     * (which is deprecated)
+     *
+     * @param EditController $subject
+     * @param Page $result
+     *
+     * @return Page
+     */
+    public function afterExecute(EditController $subject, $result)
+    {
+        $categoryId = $subject->getRequest()->getParam('id');
+        try {
+            $currentCategory = $this->categoryRepository->get($categoryId);
+            $this->currentCategory->set($currentCategory);
+        } catch (NoSuchEntityException $e) {
+            return null;
+        }
+
+        return $result;
+    }
+}

etc/adminhtml/di.xml

@@ -5,6 +5,9 @@
     <type name="Magento\Catalog\Model\Category">
         <plugin name="algolia_algoliasearch_plugin_category_url" type="Algolia\AlgoliaSearch\Plugin\CategoryUrlPlugin"/>
     </type>
+    <type name="Magento\Catalog\Controller\Adminhtml\Category\Edit">
+        <plugin name="algolia_algoliasearch_plugin_set_admin_current_category" type="Algolia\AlgoliaSearch\Plugin\SetAdminCurrentCategory"/>
+    </type>
     <type name="Algolia\AlgoliaSearch\Block\Adminhtml\LandingPage\Renderer\UrlBuilder">
         <arguments>
             <argument name="frontendUrlBuilder" xsi:type="object">Magento\Framework\Url</argument>

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>