LYNX-184: Scope issue in attributeForm result

Author: svera

app/code/Magento/Customer/Test/Fixture/CustomerAttribute.php

@@ -41,7 +41,10 @@ class CustomerAttribute implements RevertibleDataFixtureInterface
         'attribute_group_id' => null,
         'input_filter' => null,
         'multiline_count' => 0,
-        'validate_rules' => null
+        'validate_rules' => null,
+        'website_id' => null,
+        'is_visible' => 1,
+        'scope_is_visible' => 1,
     ];
 
     /**
@@ -110,6 +113,9 @@ public function apply(array $data = []): ?DataObject
         $attr = $this->attributeFactory->createAttribute(Attribute::class, self::DEFAULT_DATA);
         $mergedData = $this->processor->process($this, $this->dataMerger->merge(self::DEFAULT_DATA, $data));
         $attr->setData($mergedData);
+        if (isset($data['website_id'])) {
+            $attr->setWebsite($data['website_id']);
+        }
         $this->resourceModelAttribute->save($attr);
         return $attr;
     }

app/code/Magento/EavGraphQl/Model/GetAttributesMetadata.php

@@ -75,8 +75,7 @@ public function execute(array $attributesInputs, int $storeId): array
         foreach ($codes as $entityType => $attributeCodes) {
             $builder = $this->searchCriteriaBuilderFactory->create();
             $builder
-                ->addFilter('attribute_code', $attributeCodes, 'in')
-                ->addFilter('is_visible', true);
+                ->addFilter('attribute_code', $attributeCodes, 'in');
             try {
                 $attributes = $this->attributeRepository->getList($entityType, $builder->create())->getItems();
             } catch (LocalizedException $exception) {
@@ -95,6 +94,9 @@ public function execute(array $attributesInputs, int $storeId): array
                 ];
             }
             foreach ($attributes as $attribute) {
+                if (method_exists($attribute, 'getIsVisible') && !$attribute->getIsVisible()) {
+                    continue;
+                }
                 $items[] = $this->getAttributeData->execute($attribute, $entityType, $storeId);
             }
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/Attribute/AttributesFormTest.php

@@ -10,6 +10,10 @@
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Test\Fixture\CustomerAttribute;
 use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
+use Magento\Store\Test\Fixture\Store as StoreFixture;
+use Magento\Store\Test\Fixture\Website as WebsiteFixture;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -123,4 +127,58 @@ public function testAttributesFormDoesNotExist(): void
             $this->graphQlQuery(sprintf(self::QUERY, 'not_existing_form'))
         );
     }
+
+    #[
+        DataFixture(WebsiteFixture::class, as: 'website2'),
+        DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'store_group2'),
+        DataFixture(StoreFixture::class, ['store_group_id' => '$store_group2.id$'], 'store2'),
+        DataFixture(
+            CustomerAttribute::class,
+            [
+                'entity_type_id' => AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS,
+                'used_in_forms' => ['customer_register_address'],
+                'website_id' => '$website2.id$',
+                'scope_is_visible' => 1,
+                'is_visible' => 0,
+            ],
+            'attribute_1'
+        ),
+    ]
+    public function testAttributesFormScope(): void
+    {
+        /** @var AttributeInterface $attribute1 */
+        $attribute1 = DataFixtureStorageManager::getStorage()->get('attribute_1');
+
+        $result = $this->graphQlQuery(sprintf(self::QUERY, 'customer_register_address'));
+
+        foreach ($result['attributesForm']['items'] as $item) {
+            if (array_contains($item, $attribute1->getAttributeCode())) {
+                $this->fail(
+                    sprintf("Attribute '%s' found in query response in global scope", $attribute1->getAttributeCode())
+                );
+            }
+        }
+
+        /** @var StoreInterface $store */
+        $store = DataFixtureStorageManager::getStorage()->get('store2');
+
+        $result = $this->graphQlQuery(
+            sprintf(self::QUERY, 'customer_register_address'),
+            [],
+            '',
+            ['Store' => $store->getCode()]
+        );
+
+        foreach ($result['attributesForm']['items'] as $item) {
+            if (array_contains($item, $attribute1->getAttributeCode())) {
+                return;
+            }
+        }
+        $this->fail(
+            sprintf(
+                "Attribute '%s' not found in query response in website scope",
+                $attribute1->getAttributeCode()
+            )
+        );
+    }
 }