PWA-1720: Expose storefront properties of Catalog attributes

- Updated field names

Author: Prabhu Ram

app/code/Magento/EavGraphQl/Model/Resolver/CustomAttributeMetadata.php

@@ -109,11 +109,10 @@ public function resolve(
     private function getStorefrontProperties(AttributeInterface $attribute)
     {
         return [
-            'use_in_search' => $attribute->getIsSearchable(),
             'position'=> $attribute->getPosition(),
-            'visible_on_catalog_storefront'=> $attribute->getIsVisibleOnFront(),
+            'visible_on_catalog_pages'=> $attribute->getIsVisibleOnFront(),
             'use_in_search_results_layered_navigation' => $attribute->getIsFilterableInSearch(),
-            'used_in_product_listing'=> $attribute->getUsedInProductListing(),
+            'use_in_product_listing'=> $attribute->getUsedInProductListing(),
             'use_in_layered_navigation'=>
                 $this->getLayeredNavigationPropertiesEnum()[$attribute->getisFilterable()] ?? null
         ];

app/code/Magento/EavGraphQl/etc/schema.graphqls

@@ -19,10 +19,9 @@ type Attribute @doc(description: "Attribute contains the attribute_type of the s
 }
 
 type StorefrontProperties {
-    used_in_product_listing: Boolean
-    use_in_search: Boolean
+    use_in_product_listing: Boolean
     position: Int
-    visible_on_catalog_storefront: Boolean
+    visible_on_catalog_pages: Boolean
     use_in_layered_navigation: UseInLayeredNavigationOptions
     use_in_search_results_layered_navigation: Boolean
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeOptionsTest.php

@@ -121,11 +121,10 @@ public function testCustomAttributeMetadataOptions()
       input_type
        storefront_properties {
          position
-         use_in_search
-         used_in_product_listing
+         use_in_product_listing
          use_in_layered_navigation
          use_in_search_results_layered_navigation
-         visible_on_catalog_storefront
+         visible_on_catalog_pages
       }
     }
   }
@@ -137,11 +136,10 @@ public function testCustomAttributeMetadataOptions()
         $actualStorefrontPropery = $response['customAttributeMetadata']['items'][0]['storefront_properties'];
         $expectedStorefrontProperties = [
             'position' => 0,
-            'use_in_search' => false,
-            'used_in_product_listing' => true,
+            'use_in_product_listing' => true,
             'use_in_layered_navigation' => 'NO',
             'use_in_search_results_layered_navigation' => false,
-            'visible_on_catalog_storefront' => true
+            'visible_on_catalog_pages' => true
         ];
         $this->assertEquals($expectedStorefrontProperties, $actualStorefrontPropery);
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php

@@ -127,11 +127,10 @@ public function testComplexAttributeTypeResolver()
       entity_type
       input_type
       storefront_properties {
-         use_in_search
-         used_in_product_listing
+         use_in_product_listing
          use_in_layered_navigation
          use_in_search_results_layered_navigation
-         visible_on_catalog_storefront
+         visible_on_catalog_pages
       }
     }
   }
@@ -174,7 +173,13 @@ public function testComplexAttributeTypeResolver()
             'text',
             'gallery'
         ];
-        $this->assertComplexAttributeType($attributeTypes, $expectedAttributeCodes, $entityTypes, $inputTypes, $response);
+        $this->assertComplexAttributeType(
+            $attributeTypes,
+            $expectedAttributeCodes,
+            $entityTypes,
+            $inputTypes,
+            $response
+        );
     }
 
     /**
@@ -247,7 +252,8 @@ private function assertComplexAttributeType(
         $attributeMetaDataItems = array_map(null, $actualResponse['customAttributeMetadata']['items'], $attributeTypes);
 
         foreach ($attributeMetaDataItems as $itemIndex => $itemArray) {
-            if($itemArray[0]['entity_type'] === 'catalog_category' || $itemArray[0]['entity_type'] ==='catalog_product') {
+            if ($itemArray[0]['entity_type'] === 'catalog_category'
+                || $itemArray[0]['entity_type'] ==='catalog_product') {
                 $this->assertResponseFields(
                     $attributeMetaDataItems[$itemIndex][0],
                     [
@@ -256,19 +262,17 @@ private function assertComplexAttributeType(
                         "entity_type" => $entityTypes[$itemIndex],
                         "input_type" => $inputTypes[$itemIndex],
                         "storefront_properties" => [
-                            'use_in_search' => false,
-                            'used_in_product_listing' => false,
+                            'use_in_product_listing' => false,
                             'use_in_layered_navigation' => 'NO',
                             'use_in_search_results_layered_navigation' => false,
-                            'visible_on_catalog_storefront' => false,
+                            'visible_on_catalog_pages' => false,
                         ]
                     ]
                 );
-            }
-            else {
+            } else {
                 $this->assertNotEmpty($attributeMetaDataItems[$itemIndex][0]['storefront_properties']);
                 // 5 fields are present
-                $this->assertCount(5, $attributeMetaDataItems[$itemIndex][0]['storefront_properties']);
+                $this->assertCount(4, $attributeMetaDataItems[$itemIndex][0]['storefront_properties']);
                 unset($attributeMetaDataItems[$itemIndex][0]['storefront_properties']);
                 $this->assertResponseFields(
                     $attributeMetaDataItems[$itemIndex][0],