ACP2E-2653: Disabling Layered Navetion - Does not remove aggregation from Graphql

Author: pradeep1819

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Aggregations/Category/IncludeDirectChildrenOnly.php

@@ -8,7 +8,9 @@
 namespace Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Builder\Aggregations\Category;
 
 use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Catalog\Model\Config\LayerCategoryConfig;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Search\Response\Aggregation;
 use Magento\Framework\Search\Response\AggregationFactory;
@@ -61,25 +63,34 @@ class IncludeDirectChildrenOnly implements ResetAfterRequestInterface
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var LayerCategoryConfig|null
+     */
+    private $layerCategoryConfig;
+
     /**
      * @param AggregationFactory $aggregationFactory
      * @param BucketFactory $bucketFactory
      * @param StoreManagerInterface $storeManager
      * @param CategoryListInterface $categoryList
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param LayerCategoryConfig|null $layerCategoryConfig
      */
     public function __construct(
         AggregationFactory $aggregationFactory,
         BucketFactory $bucketFactory,
         StoreManagerInterface $storeManager,
         CategoryListInterface $categoryList,
-        SearchCriteriaBuilder $searchCriteriaBuilder
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        ?LayerCategoryConfig $layerCategoryConfig = null
     ) {
         $this->aggregationFactory = $aggregationFactory;
         $this->bucketFactory = $bucketFactory;
         $this->storeManager = $storeManager;
         $this->categoryList = $categoryList;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->layerCategoryConfig = $layerCategoryConfig ?? ObjectManager::getInstance()
+                ->get(LayerCategoryConfig::class);
     }
 
     /**
@@ -91,28 +102,34 @@ public function __construct(
      */
     public function filter(AggregationInterface $aggregation, ?int $storeId): Aggregation
     {
-        $categoryIdsRequested = $this->filter['category'] ?? null;
-        if ($categoryIdsRequested === null) {
-            return $aggregation;
-        }
-        $buckets = $aggregation->getBuckets();
-        $categoryBucket = $buckets[self::CATEGORY_BUCKET] ?? null;
-        if ($categoryBucket === null || empty($categoryBucket->getValues())) {
-            return $aggregation;
+        if (!$this->layerCategoryConfig->isCategoryFilterVisibleInLayerNavigation()) {
+            $buckets = $aggregation->getBuckets();
+            unset($buckets[self::CATEGORY_BUCKET]);
+        } else {
+            $categoryIdsRequested = $this->filter['category'] ?? null;
+            if ($categoryIdsRequested === null) {
+                return $aggregation;
+            }
+            $buckets = $aggregation->getBuckets();
+            $categoryBucket = $buckets[self::CATEGORY_BUCKET] ?? null;
+            if ($categoryBucket === null || empty($categoryBucket->getValues())) {
+                return $aggregation;
+            }
+            $categoryIdsRequested = is_array($categoryIdsRequested) ? $categoryIdsRequested : [$categoryIdsRequested];
+            $bucketValuesFiltered = $this->filterBucketValues(
+                $categoryBucket->getValues(),
+                $categoryIdsRequested,
+                $storeId
+            );
+            $categoryBucketResolved = $this->bucketFactory->create(
+                [
+                    'name' => self::CATEGORY_BUCKET,
+                    'values' => $bucketValuesFiltered
+                ]
+            );
+            $buckets[self::CATEGORY_BUCKET] = $categoryBucketResolved;
         }
-        $categoryIdsRequested = is_array($categoryIdsRequested) ? $categoryIdsRequested : [$categoryIdsRequested];
-        $bucketValuesFiltered = $this->filterBucketValues(
-            $categoryBucket->getValues(),
-            $categoryIdsRequested,
-            $storeId
-        );
-        $categoryBucketResolved = $this->bucketFactory->create(
-            [
-                'name' => self::CATEGORY_BUCKET,
-                'values' => $bucketValuesFiltered
-            ]
-        );
-        $buckets[self::CATEGORY_BUCKET] = $categoryBucketResolved;
+
         return $this->aggregationFactory->create([self::BUCKETS_NAME => $buckets]);
     }