Merge branch '2.4-develop' into ACPT-943

Author: magento-devops-queue-mgr-svc

app/code/Magento/CustomerGraphQl/Model/Customer/GetAttributesForm.php

@@ -42,6 +42,12 @@ public function execute(string $formCode): ?array
     {
         $attributes = [];
         foreach ($this->entity->getAttributes($formCode) as $attribute) {
+            // region_id and country_id returns large datasets that is also not related between each other and
+            // not filterable. DirectoryGraphQl contains queries that allow to retrieve this information in a
+            // meaningful way
+            if ($attribute->getAttributeCode() === 'region_id' || $attribute->getAttributeCode() === 'country_id') {
+                continue;
+            }
             $attributes[] = ['entity_type' => $this->type, 'attribute_code' => $attribute->getAttributeCode()];
         }
         return $attributes;

app/code/Magento/EavGraphQl/Model/Output/GetAttributeData.php

@@ -70,6 +70,7 @@ public function execute(
      *
      * @param AttributeInterface $attribute
      * @return string
+     * @throws RuntimeException
      */
     private function getFrontendInput(AttributeInterface $attribute): string
     {
@@ -108,12 +109,28 @@ function (AttributeOptionInterface $option) use ($attribute) {
                     return [
                         'label' => $label,
                         'value' => $value,
-                        'is_default' => $attribute->getDefaultValue() ?
-                            in_array($value, explode(',', $attribute->getDefaultValue())) : null
+                        'is_default' => $attribute->getDefaultValue() &&
+                            $this->isDefault($value, $attribute->getDefaultValue())
                     ];
                 },
                 $attribute->getOptions()
             )
         );
     }
+
+    /**
+     * Returns true if $value is the default value. Otherwise, false.
+     *
+     * @param mixed $value
+     * @param mixed $defaultValue
+     * @return bool
+     */
+    private function isDefault(mixed $value, mixed $defaultValue): bool
+    {
+        if (is_array($defaultValue)) {
+            return in_array($value, $defaultValue);
+        }
+
+        return in_array($value, explode(',', $defaultValue));
+    }
 }

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

@@ -11,7 +11,7 @@ type Query {
     customAttributeMetadataV2(attributes: [AttributeInput!]): AttributesMetadataOutput! @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributesMetadata") @doc(description: "Retrieve EAV attributes metadata.") @cache(cacheIdentity: "Magento\\EavGraphQl\\Model\\Resolver\\Cache\\CustomAttributeMetadataV2Identity")
     attributesForm(formCode: String! @doc(description: "Form code.")): AttributesFormOutput!
     @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributesForm")
-    @doc(description: "Retrieve EAV attributes associated to a frontend form.")
+    @doc(description: "Retrieve EAV attributes associated to a frontend form. For region_id and country_id attributes information use DirectoryGraphQl module.")
     @cache(cacheIdentity: "Magento\\Eav\\Model\\Cache\\AttributesFormIdentity")
     attributesList(
         entityType: AttributeEntityTypeEnum! @doc(description: "Entity type.")
@@ -91,7 +91,7 @@ interface CustomAttributeMetadataInterface @typeResolver(class: "Magento\\EavGra
 interface CustomAttributeOptionInterface @typeResolver(class: "Magento\\EavGraphQl\\Model\\TypeResolver\\AttributeOption") {
     label: String! @doc(description: "The label assigned to the attribute option.")
     value: String! @doc(description: "The attribute option value.")
-    is_default: Boolean @doc(description: "Is the option value default.")
+    is_default: Boolean! @doc(description: "Is the option value default.")
 }
 
 type AttributeOptionMetadata implements CustomAttributeOptionInterface @doc(description: "Base EAV implementation of CustomAttributeOptionInterface.") {

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

@@ -87,6 +87,8 @@ public function testAttributesForm(): void
             }
             $this->assertNotContains($attribute2->getAttributeCode(), $item);
             $this->assertNotContains($attribute3->getAttributeCode(), $item);
+            $this->assertNotContains('region_id', $item);
+            $this->assertNotContains('country_id', $item);
         }
         $this->fail(sprintf("Attribute '%s' not found in query response", $attribute1->getAttributeCode()));
     }