Merge remote-tracking branch 'origin/MC-31497' into honey-235-bug-pr

Author: danielrenaud

app/code/Magento/CatalogGraphQl/Model/Config/FilterAttributeReader.php

@@ -10,16 +10,15 @@
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\GraphQl\Schema\Type\Entity\MapperInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
-use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 
 /**
  * Adds custom/eav attributes to product filter type in the GraphQL config.
  *
  * Product Attribute should satisfy the following criteria:
- * - Attribute is searchable
- * - "Visible in Advanced Search" is set to "Yes"
- * - Attribute of type "Select" must have options
+ * - (Attribute is searchable AND "Visible in Advanced Search" is set to "Yes")
+ * - OR attribute is "Used in Layered Navigation"
+ * - AND Attribute of type "Select" must have options
  */
 class FilterAttributeReader implements ReaderInterface
 {
@@ -77,7 +76,7 @@ public function read($scope = null) : array
         $typeNames = $this->mapper->getMappedTypes(self::ENTITY_TYPE);
         $config = [];
 
-        foreach ($this->getAttributeCollection() as $attribute) {
+        foreach ($this->getFilterAttributes() as $attribute) {
             $attributeCode = $attribute->getAttributeCode();
 
             foreach ($typeNames as $typeName) {
@@ -120,15 +119,25 @@ private function getFilterType(Attribute $attribute): string
     }
 
     /**
-     * Create attribute collection
+     * Get attributes to use in product filter input
      *
-     * @return Collection|\Magento\Catalog\Model\ResourceModel\Eav\Attribute[]
+     * @return array
      */
-    private function getAttributeCollection()
+    private function getFilterAttributes(): array
     {
-        return $this->collectionFactory->create()
+        $filterableAttributes = $this->collectionFactory
+            ->create()
+            ->addHasOptionsFilter()
+            ->addIsFilterableFilter()
+            ->getItems();
+
+        $searchableAttributes = $this->collectionFactory
+            ->create()
             ->addHasOptionsFilter()
             ->addIsSearchableFilter()
-            ->addDisplayInAdvancedSearchFilter();
+            ->addDisplayInAdvancedSearchFilter()
+            ->getItems();
+
+        return $filterableAttributes + $searchableAttributes;
     }
 }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/FilterArgument/ProductEntityAttributesForAst.php

@@ -17,6 +17,10 @@
  */
 class ProductEntityAttributesForAst implements FieldEntityAttributesInterface
 {
+    private const PRODUCT_BASE_TYPE = 'SimpleProduct';
+
+    private const PRODUCT_FILTER_INPUT = 'ProductAttributeFilterInput';
+
     /**
      * @var ConfigInterface
      */
@@ -51,9 +55,9 @@ public function __construct(
      */
     public function getEntityAttributes() : array
     {
-        $productTypeSchema = $this->config->getConfigElement('SimpleProduct');
+        $productTypeSchema = $this->config->getConfigElement(self::PRODUCT_BASE_TYPE);
         if (!$productTypeSchema instanceof Type) {
-            throw new \LogicException(__("SimpleProduct type not defined in schema."));
+            throw new \LogicException(__(self::PRODUCT_BASE_TYPE . " type not defined in schema."));
         }
 
         $fields = [];
@@ -69,6 +73,9 @@ public function getEntityAttributes() : array
             }
         }
 
+        $productAttributeFilterFields = $this->getProductAttributeFilterFields();
+        $fields = array_merge($fields, $productAttributeFilterFields);
+
         foreach ($this->additionalAttributes as $attributeName) {
             $fields[$attributeName] = [
                 'type' => 'String',
@@ -78,4 +85,24 @@ public function getEntityAttributes() : array
 
         return $fields;
     }
+
+    /**
+     * Get fields from ProductAttributeFilterInput
+     *
+     * @return array
+     */
+    private function getProductAttributeFilterFields()
+    {
+        $filterFields = [];
+
+        $productAttributeFilterSchema = $this->config->getConfigElement(self::PRODUCT_FILTER_INPUT);
+        $productAttributeFilterFields = $productAttributeFilterSchema->getFields();
+        foreach ($productAttributeFilterFields as $filterField) {
+            $filterFields[$filterField->getName()] = [
+                'type' => 'String',
+                'fieldName' => $filterField->getName(),
+            ];
+        }
+        return $filterFields;
+    }
 }