MC-29026: GraphQL returns filters with some data if you making request to not existing or empty category

Author: Oleksandr Iegorov

app/code/Magento/CatalogGraphQl/Model/Resolver/Layer/DataProvider/Filters.php

@@ -34,14 +34,16 @@ public function __construct(
      * Get layered navigation filters data
      *
      * @param string $layerType
+     * @param array|null $attributesToFilter
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function getData(string $layerType) : array
+    public function getData(string $layerType, array $attributesToFilter = null) : array
     {
         $filtersData = [];
         /** @var AbstractFilter $filter */
         foreach ($this->filtersProvider->getFilters($layerType) as $filter) {
-            if ($filter->getItemsCount()) {
+            if ($this->isNeedToAddFilter($filter, $attributesToFilter)) {
                 $filterGroup = [
                     'name' => (string)$filter->getName(),
                     'filter_items_count' => $filter->getItemsCount(),
@@ -60,4 +62,19 @@ public function getData(string $layerType) : array
         }
         return $filtersData;
     }
+
+    private function isNeedToAddFilter(AbstractFilter $filter, array $attributesToFilter): bool
+    {
+        if ($attributesToFilter === null) {
+            $result = (bool)$filter->getItemsCount();
+        } else {
+            try {
+                $filterAttribute = $filter->getAttributeModel();
+                $result = in_array($filterAttribute->getAttributeCode(), $attributesToFilter);
+            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                $result = false;
+            }
+        }
+        return $result;
+    }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/LayerFilters.php

@@ -44,6 +44,29 @@ public function resolve(
             return null;
         }
 
-        return $this->filtersDataProvider->getData($value['layer_type']);
+        $attributes = $this->prepareAttributesResults($value);
+        return $this->filtersDataProvider->getData($value['layer_type'], $attributes);
+    }
+
+    /**
+     * Get attributes available to filtering from the search result
+     *
+     * @param array $value
+     * @return array|null
+     */
+    private function prepareAttributesResults(array $value): ?array
+    {
+        $attributes = [];
+        if (!empty($value['search_result'])) {
+            $buckets = $value['search_result']->getSearchAggregation()->getBuckets();
+            foreach ($buckets as $bucket) {
+                if (!empty($bucket->getValues())) {
+                    $attributes[] = str_replace('_bucket', '', $bucket->getName());
+                }
+            }
+        } else {
+            $attributes = null;
+        }
+        return $attributes;
     }
 }

app/code/Magento/SwatchesGraphQl/Plugin/Filters/DataProviderPlugin.php

@@ -53,12 +53,17 @@ public function __construct(
      * @param Filters $subject
      * @param \Closure $proceed
      * @param string $layerType
+     * @param array $attributesToFilter
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function aroundGetData(Filters $subject, \Closure $proceed, string $layerType) : array
-    {
+    public function aroundGetData(
+        Filters $subject,
+        \Closure $proceed,
+        string $layerType,
+        array $attributesToFilter = null
+    ) : array {
         $swatchFilters = [];
         /** @var AbstractFilter $filter */
         foreach ($this->filtersProvider->getFilters($layerType) as $filter) {
@@ -69,7 +74,7 @@ public function aroundGetData(Filters $subject, \Closure $proceed, string $layer
             }
         }
 
-        $filtersData = $proceed($layerType);
+        $filtersData = $proceed($layerType, $attributesToFilter);
 
         foreach ($filtersData as $groupKey => $filterGroup) {
             /** @var AbstractFilter $swatchFilter */