Merge remote-tracking branch 'origin/MC-37727-attribute-labels' into honey-pr-bundle

Author: Prabhu Ram

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

@@ -64,6 +64,13 @@ public function getOptions(array $optionIds, ?int $storeId, array $attributeCode
                     'attribute_label' => 'a.frontend_label',
                 ]
             )
+            ->joinLeft(
+                ['attribute_label' => $this->resourceConnection->getTableName('eav_attribute_label')],
+                "a.attribute_id = attribute_label.attribute_id AND attribute_label.store_id = {$storeId}",
+                [
+                    'attribute_store_label' => 'attribute_label.value',
+                ]
+            )
             ->joinLeft(
                 ['options' => $this->resourceConnection->getTableName('eav_attribute_option')],
                 'a.attribute_id = options.attribute_id',
@@ -119,7 +126,7 @@ private function formatResult(\Magento\Framework\DB\Select $select): array
                 $result[$option['attribute_code']] = [
                     'attribute_id' => $option['attribute_id'],
                     'attribute_code' => $option['attribute_code'],
-                    'attribute_label' => $option['attribute_label'],
+                    'attribute_label' => $option['attribute_store_label'] ? $option['attribute_store_label'] : $option['attribute_label'],
                     'options' => [],
                 ];
             }

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

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Exception;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductAttributeStoreTest extends GraphQlAbstract
+{
+    /**
+     * Test that custom attribute labels are returned respecting store
+     *
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute_store_options.php
+     * @throws LocalizedException
+     */
+    public function testAttributeStoreLabels(): void
+    {
+        $this->attributeLabelTest('Test Configurable Default Store');
+        $this->attributeLabelTest('Test Configurable Test Store', ['Store' => 'test']);
+    }
+
+    /**
+     * @param $expectedLabel
+     * @param array $headers
+     * @throws LocalizedException
+     * @throws Exception
+     */
+    private function attributeLabelTest($expectedLabel, array $headers = []): void
+    {
+        $query = <<<QUERY
+{
+    products(search:"Simple",
+         pageSize: 3
+         currentPage: 1
+       )
+  {
+    aggregations
+    {
+        attribute_code
+        label
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $headers);
+        $this->assertNotEmpty($response['products']['aggregations']);
+        $attributes = $response['products']['aggregations'];
+        foreach ($attributes as $attribute) {
+            if ($attribute['attribute_code'] === 'test_configurable') {
+                $this->assertEquals($expectedLabel, $attribute['label']);
+            }
+        }
+    }
+}

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_store_options.php

@@ -50,7 +50,11 @@
             'is_visible_on_front' => 1,
             'used_in_product_listing' => 1,
             'used_for_sort_by' => 1,
-            'frontend_label' => ['Test Configurable'],
+            'frontend_label' => [
+                Store::DEFAULT_STORE_ID => 'Test Configurable Admin Store',
+                Store::DISTRO_STORE_ID => 'Test Configurable Default Store',
+                $store->getId() => 'Test Configurable Test Store'
+            ],
             'backend_type' => 'int',
             'option' => [
                 'value' => ['option_0' => [

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_store_options_rollback.php

@@ -24,12 +24,6 @@
     }
 }
 
-$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
-foreach ($productCollection as $product) {
-    $product->delete();
-}
-
 /** @var $category \Magento\Catalog\Model\Category */
 $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
 $category->load(333);