Do not apply the currentcategory filter in admin.

Smile-SA · Feb 7, 2025 · 20078e0 · 20078e0
1 parent eae3cd3
commit 20078e0
Showing 1 changed file with 29 additions and 2 deletions.
diff --git a/...le-elasticsuite-catalog/Model/Product/Search/Request/Container/Filter/CurrentCategory.php b/...le-elasticsuite-catalog/Model/Product/Search/Request/Container/Filter/CurrentCategory.php
@@ -14,6 +14,7 @@
 namespace Smile\ElasticsuiteCatalog\Model\Product\Search\Request\Container\Filter;
 
 use Magento\Catalog\Model\Config\LayerCategoryConfig;
+use Magento\Framework\App\State;
 use Smile\ElasticsuiteCore\Api\Search\ContextInterface;
 use Smile\ElasticsuiteCore\Api\Search\Request\Container\FilterInterface;
 use Smile\ElasticsuiteVirtualCategory\Model\Category\Filter\Provider;
@@ -42,21 +43,29 @@ class CurrentCategory implements FilterInterface
      */
     private $filterProvider;
 
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $appState;
+
     /**
      * Current Category filter constructor.
      *
      * @param ContextInterface    $searchContext       Current search context.
      * @param LayerCategoryConfig $layerCategoryConfig Category LayerConfig
      * @param Provider            $filterProvider      Category Filter provider.
+     * @param State               $appState            Application state.
      */
     public function __construct(
         ContextInterface $searchContext,
         LayerCategoryConfig $layerCategoryConfig,
-        Provider $filterProvider
+        Provider $filterProvider,
+        State $appState
     ) {
         $this->searchContext       = $searchContext;
         $this->layerCategoryConfig = $layerCategoryConfig;
         $this->filterProvider      = $filterProvider;
+        $this->appState            = $appState;
     }
 
     /**
@@ -66,7 +75,11 @@ public function getFilterQuery()
     {
         $query = null;
 
-        if (false === $this->isDisplayCategoryFilter() && $this->searchContext->getCurrentCategory()) {
+        if ($this->isAdminArea()) {
+            return null;
+        }
+
+	if (false === $this->isDisplayCategoryFilter() && $this->searchContext->getCurrentCategory()) {
             $query = $this->filterProvider->getQueryFilter($this->searchContext->getCurrentCategory());
         }
 
@@ -82,4 +95,18 @@ private function isDisplayCategoryFilter()
     {
         return $this->layerCategoryConfig->isCategoryFilterVisibleInLayerNavigation();
     }
+
+    /**
+     * Check if we are in the admin area
+     *
+     * @return bool
+     */
+    private function isAdminArea()
+    {
+        try {
+            return $this->appState->getAreaCode() === \Magento\Framework\App\Area::AREA_ADMINHTML;
+        } catch (\Magento\Framework\Exception\LocalizedException $exception) {
+            return false;
+        }
+    }
 }