ENGCOM-7740: #27952: missing store_name in GraphQL resolver - adde… #28855

 - Merge Pull Request #28855 from sasha19957099/magento2:27952_Missing_store_name_in_GraphQl_Resolver
 - Merged commits:
   1. 85db11d
   2. 096aa37
   3. de9ff7d
   4. 1e6c55a
   5. 42c534c
   6. c3e38ac

Author: magento-engcom-team

app/code/Magento/Store/Api/Data/StoreConfigInterface.php

@@ -6,7 +6,7 @@
 namespace Magento\Store\Api\Data;
 
 /**
- * StoreConfig interface
+ * Interface for store config
  *
  * @api
  * @since 100.0.2
@@ -141,7 +141,7 @@ public function setWeightUnit($weightUnit);
     public function getBaseUrl();
 
     /**
-     * set base URL
+     * Set base URL
      *
      * @param string $baseUrl
      * @return $this
@@ -201,7 +201,7 @@ public function setBaseMediaUrl($baseMediaUrl);
     public function getSecureBaseUrl();
 
     /**
-     * set secure base URL
+     * Set secure base URL
      *
      * @param string $secureBaseUrl
      * @return $this

app/code/Magento/Store/Model/Data/StoreConfig.php

@@ -6,7 +6,7 @@
 namespace Magento\Store\Model\Data;
 
 /**
- * Class StoreConfig
+ * Allows to get and set store config values
  *
  * @codeCoverageIgnore
  */
@@ -188,7 +188,7 @@ public function getBaseUrl()
     }
 
     /**
-     * set base URL
+     * Set base URL
      *
      * @param string $baseUrl
      * @return $this
@@ -293,7 +293,7 @@ public function getSecureBaseUrl()
     }
 
     /**
-     * set secure base URL
+     * Set secure base URL
      *
      * @param string $secureBaseUrl
      * @return $this
@@ -367,7 +367,7 @@ public function setSecureBaseMediaUrl($secureBaseMediaUrl)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Store\Api\Data\StoreConfigExtensionInterface|null
      */
@@ -377,7 +377,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
      * @return $this

app/code/Magento/Store/Model/Service/StoreConfigManager.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Store\Model\Service;
 
+/**
+ * Allows to get store config
+ */
 class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterface
 {
     /**
@@ -53,6 +56,8 @@ public function __construct(
     }
 
     /**
+     * Get store configs
+     *
      * @param string[] $storeCodes list of stores by store codes, will return all if storeCodes is not set
      * @return \Magento\Store\Api\Data\StoreConfigInterface[]
      */
@@ -71,6 +76,8 @@ public function getStoreConfigs(array $storeCodes = null)
     }
 
     /**
+     * Get store config
+     *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Store\Api\Data\StoreConfigInterface
      */

app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php

@@ -55,11 +55,10 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        $storeConfigData = array_merge(
+        return array_merge(
             $this->getBaseConfigData($store),
             $this->getExtendedConfigData((int)$store->getId())
         );
-        return $storeConfigData;
     }
 
     /**
@@ -72,7 +71,7 @@ private function getBaseConfigData(StoreInterface $store) : array
     {
         $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
 
-        $storeConfigData = [
+        return [
             'id' => $storeConfig->getId(),
             'code' => $storeConfig->getCode(),
             'website_id' => $storeConfig->getWebsiteId(),
@@ -88,9 +87,9 @@ private function getBaseConfigData(StoreInterface $store) : array
             'secure_base_url' => $storeConfig->getSecureBaseUrl(),
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
-            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
+            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
+            'store_name' => $store->getName()
         ];
-        return $storeConfigData;
     }
 
     /**

app/code/Magento/StoreGraphQl/etc/graphql/di.xml

@@ -23,11 +23,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
-        <arguments>
-            <argument name="extendedConfigData" xsi:type="array">
-                <item name="store_name" xsi:type="string">store/information/name</item>
-            </argument>
-        </arguments>
-    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php

@@ -91,6 +91,6 @@ public function testGetStoreConfig()
             $response['storeConfig']['secure_base_static_url']
         );
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
-        $this->assertEquals('Test Store', $response['storeConfig']['store_name']);
+        $this->assertEquals($store->getName(), $response['storeConfig']['store_name']);
     }
 }