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

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
 use Magento\CatalogGraphQl\Model\Resolver\Layer\FiltersProvider;
+use Magento\Catalog\Model\Layer\Filter\Item;
 
 /**
  * Layered navigation filters data provider.
@@ -49,7 +50,7 @@ public function getData(string $layerType, array $attributesToFilter = null) : a
                     'filter_items_count' => $filter->getItemsCount(),
                     'request_var' => $filter->getRequestVar(),
                 ];
-                /** @var \Magento\Catalog\Model\Layer\Filter\Item $filterItem */
+                /** @var Item $filterItem */
                 foreach ($filter->getItems() as $filterItem) {
                     $filterGroup['filter_items'][] = [
                         'label' => (string)$filterItem->getLabel(),
@@ -63,15 +64,22 @@ public function getData(string $layerType, array $attributesToFilter = null) : a
         return $filtersData;
     }
 
+    /**
+     * Check for adding filter to the list
+     *
+     * @param AbstractFilter $filter
+     * @param array $attributesToFilter
+     * @return bool
+     */
     private function isNeedToAddFilter(AbstractFilter $filter, array $attributesToFilter): bool
     {
         if ($attributesToFilter === null) {
             $result = (bool)$filter->getItemsCount();
         } else {
-            try {
+            if ($filter->hasAttributeModel()) {
                 $filterAttribute = $filter->getAttributeModel();
                 $result = in_array($filterAttribute->getAttributeCode(), $attributesToFilter);
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } else {
                 $result = false;
             }
         }

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

@@ -53,10 +53,12 @@ public function __construct(
      * @param Filters $subject
      * @param \Closure $proceed
      * @param string $layerType
-     * @param array $attributesToFilter
+     * @param array|null $attributesToFilter
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     public function aroundGetData(
         Filters $subject,
@@ -97,4 +99,5 @@ public function aroundGetData(
 
         return $filtersData;
     }
+    //phpcs:enable
 }