Merge remote-tracking branch 'origin/ACP2E-3880' into PR_2025_05_16

Author: katmoon

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -51,7 +51,9 @@ public function process(
         array $attributeNames,
         ?ContextInterface $context = null
     ): Collection {
-        if (in_array('media_gallery_entries', $attributeNames)) {
+        if (in_array('media_gallery_entries', $attributeNames) ||
+            in_array('media_gallery', $attributeNames)
+        ) {
             $mediaAttributes = $this->mediaConfig->getMediaAttributeCodes();
             foreach ($mediaAttributes as $mediaAttribute) {
                 if (!in_array($mediaAttribute, $attributeNames)) {

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

@@ -229,6 +229,7 @@ interface MediaGalleryInterface @doc(description: "Contains basic information ab
     label: String @doc(description: "The label of the product image or video.")
     position: Int @doc(description: "The media item's position after it has been sorted.")
     disabled: Boolean @doc(description: "Indicates whether the image is hidden from view.")
+    types: [String] @doc(description: "Array of image types. It can have the following values: image, small_image, thumbnail.")
 }
 
 type ProductImage implements MediaGalleryInterface @doc(description: "Contains product image information, including the image URL and label.") {

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -119,6 +119,7 @@ public function testMediaGallery()
         url
         position
         disabled
+        types
       }
     }
   }
@@ -136,6 +137,10 @@ public function testMediaGallery()
         $this->assertEquals(2, $mediaGallery[1]['position']);
         $this->assertFalse($mediaGallery[1]['disabled']);
         $this->assertTrue($this->checkImageExists($mediaGallery[1]['url']));
+        $this->assertNotEmpty($mediaGallery[0]['types']);
+        $this->assertEquals('image', $mediaGallery[0]['types'][0]);
+        $this->assertNotEmpty($mediaGallery[1]['types']);
+        $this->assertEquals('thumbnail', $mediaGallery[1]['types'][0]);
     }
 
     /**
@@ -155,6 +160,7 @@ public function testMediaGalleryForProductVideos()
       	label
         url
         position
+        types
         disabled
         ... on ProductVideo {
               video_content {
@@ -179,6 +185,8 @@ public function testMediaGalleryForProductVideos()
         $this->assertTrue($this->checkImageExists($mediaGallery[0]['url']));
         $this->assertFalse($mediaGallery[0]['disabled']);
         $this->assertEquals(2, $mediaGallery[0]['position']);
+        $this->assertNotEmpty($mediaGallery[0]['types']);
+        $this->assertEquals('image', $mediaGallery[0]['types'][0]);
         $this->assertNotEmpty($mediaGallery[0]['video_content']);
         $video_content = $mediaGallery[0]['video_content'];
         $this->assertEquals('external-video', $video_content['media_type']);