🔃 [Magento Community Engineering] Community Contributions - GraphQL daily delivery

Accepted Community Pull Requests:
 - magento/graphql-ce#953: Rename PayflowProToken Type (by @pmclain)
 - magento/graphql-ce#952: Add Store Name to Config Schema (by @pmclain)
 - magento/graphql-ce#959: GraphQL-879 Change description for createBraintreeClientToken mutation (by @karyna-tsymbal-atwix)
 - magento/graphql-ce#951: #878 - Deprecated the column increment_id (by @strell)
 - magento/graphql-ce#949: magento/graphql-ce#948 - Move preference for ErrorHandlerInterface (by @vpodorozh)


Fixed GitHub Issues:
 - #881: Installation with sample data failing (reported by @jameswithers) has been fixed in magento/graphql-ce#953 by @pmclain in 2.3-develop branch
   Related commits:
     1. 17ea087

 - #926: Failed due to line endings (reported by @snky1987) has been fixed in magento/graphql-ce#952 by @pmclain in 2.3-develop branch
   Related commits:
     1. 5b32e8e

 - #878: CMS page is not editable (reported by @shivkumarsingh7) has been fixed in magento/graphql-ce#951 by @strell in 2.3-develop branch
   Related commits:
     1. 746038e
     2. 225c9f7

 - #948: varnish cache - odd states, price update question (reported by @robfico) has been fixed in magento/graphql-ce#949 by @vpodorozh in 2.3-develop branch
   Related commits:
     1. fda524e

Author: magento-engcom-team

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

@@ -2,7 +2,7 @@
 # See COPYING.txt for license details.
 
 type Mutation {
-    createBraintreeClientToken: String! @resolver(class: "\\Magento\\BraintreeGraphQl\\Model\\Resolver\\CreateBraintreeClientToken") @doc(description:"Creates Braintree Client Token for creating client-side nonce.")
+    createBraintreeClientToken: String! @resolver(class: "\\Magento\\BraintreeGraphQl\\Model\\Resolver\\CreateBraintreeClientToken") @doc(description:"Creates Client Token for Braintree Javascript SDK initialization.")
 }
 
 input PaymentMethodInput {

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

@@ -8,7 +8,7 @@ type Query {
 
 type Mutation {
     createPaypalExpressToken(input: PaypalExpressTokenInput!): PaypalExpressToken @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PaypalExpressToken") @doc(description:"Initiates an Express Checkout transaction and receives a token. Use this mutation for Express Checkout and Payments Standard payment methods.")
-    createPayflowProToken(input: PayflowProTokenInput!): PayflowProToken @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PayflowProToken") @doc(description: "Initiates a transaction and receives a token. Use this mutation for Payflow Pro and Payments Pro payment methods")
+    createPayflowProToken(input: PayflowProTokenInput!): CreatePayflowProTokenOutput @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PayflowProToken") @doc(description: "Initiates a transaction and receives a token. Use this mutation for Payflow Pro and Payments Pro payment methods")
     handlePayflowProResponse(input: PayflowProResponseInput!): PayflowProResponseOutput @resolver(class: "\\Magento\\PaypalGraphQl\\Model\\Resolver\\PayflowProResponse") @doc(description: "Handles payment response and saves payment in Quote. Use this mutations for Payflow Pro and Payments Pro payment methods.")
 }
 
@@ -112,7 +112,15 @@ input PayflowProUrlInput @doc(description:"A set of relative URLs that PayPal wi
     error_url: String! @doc(description:"The relative URL of the transaction error page that PayPal will redirect to upon payment error. If the full URL to this page is https://www.example.com/paypal/action/error.html, the relative URL is paypal/action/error.html.")
 }
 
-type PayflowProToken @doc(description: "Contains the secure information used to authorize transaction. Applies to Payflow Pro and Payments Pro payment methods.") {
+type PayflowProToken @deprecated(reason: "Use CreatePayflowProTokenOutput instead.") @doc(description: "Contains the secure information used to authorize transaction. Applies to Payflow Pro and Payments Pro payment methods.") {
+    secure_token: String!
+    secure_token_id: String!
+    response_message: String!
+    result: Int!
+    result_code: Int!
+}
+
+type CreatePayflowProTokenOutput @doc(description: "Contains the secure information used to authorize transaction. Applies to Payflow Pro and Payments Pro payment methods.") {
     secure_token: String!
     secure_token_id: String!
     response_message: String!

app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php

@@ -56,6 +56,7 @@ public function resolve(
             $items[] = [
                 'id' => $order->getId(),
                 'increment_id' => $order->getIncrementId(),
+                'order_number' => $order->getIncrementId(),
                 'created_at' => $order->getCreatedAt(),
                 'grand_total' => $order->getGrandTotal(),
                 'status' => $order->getStatus(),

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

@@ -7,7 +7,8 @@ type Query {
 
 type CustomerOrder @doc(description: "Order mapping fields") {
     id: Int
-    increment_id: String
+    increment_id: String @deprecated(reason: "Use the order_number instaed.")
+    order_number: String! @doc(description: "The order number")
     created_at: String
     grand_total: Float
     status: String

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

@@ -23,4 +23,11 @@
             </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>

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

@@ -30,4 +30,5 @@ type StoreConfig @doc(description: "The type contains information about a store
     secure_base_link_url : String @doc(description: "Secure base link URL for the store")
     secure_base_static_url : String @doc(description: "Secure base static URL for the store")
     secure_base_media_url : String @doc(description: "Secure base media URL for the store")
+    store_name : String @doc(description: "Name of the store")
 }

app/etc/di.xml

@@ -1781,4 +1781,5 @@
     <type name="Magento\Framework\DB\Adapter\AdapterInterface">
         <plugin name="execute_commit_callbacks" type="Magento\Framework\Model\ExecuteCommitCallbacks" />
     </type>
+    <preference for="Magento\Framework\GraphQl\Query\ErrorHandlerInterface" type="Magento\Framework\GraphQl\Query\ErrorHandler"/>
 </config>

app/etc/graphql/di.xml

@@ -38,9 +38,7 @@ public function testOrdersQuery()
 query {
   customerOrders {
     items {
-      id
-      increment_id
-      created_at
+      order_number
       grand_total
       status
     }
@@ -54,27 +52,27 @@ public function testOrdersQuery()
 
         $expectedData = [
             [
-                'increment_id' => '100000002',
+                'order_number' => '100000002',
                 'status' => 'processing',
                 'grand_total' => 120.00
             ],
             [
-                'increment_id' => '100000003',
+                'order_number' => '100000003',
                 'status' => 'processing',
                 'grand_total' => 130.00
             ],
             [
-                'increment_id' => '100000004',
+                'order_number' => '100000004',
                 'status' => 'closed',
                 'grand_total' => 140.00
             ],
             [
-                'increment_id' => '100000005',
+                'order_number' => '100000005',
                 'status' => 'complete',
                 'grand_total' => 150.00
             ],
             [
-                'increment_id' => '100000006',
+                'order_number' => '100000006',
                 'status' => 'complete',
                 'grand_total' => 160.00
             ]
@@ -84,19 +82,19 @@ public function testOrdersQuery()
 
         foreach ($expectedData as $key => $data) {
             $this->assertEquals(
-                $data['increment_id'],
-                $actualData[$key]['increment_id'],
-                "increment_id is different than the expected for order - " . $data['increment_id']
+                $data['order_number'],
+                $actualData[$key]['order_number'],
+                "order_number is different than the expected for order - " . $data['order_number']
             );
             $this->assertEquals(
                 $data['grand_total'],
                 $actualData[$key]['grand_total'],
-                "grand_total is different than the expected for order - " . $data['increment_id']
+                "grand_total is different than the expected for order - " . $data['order_number']
             );
             $this->assertEquals(
                 $data['status'],
                 $actualData[$key]['status'],
-                "status is different than the expected for order - " . $data['increment_id']
+                "status is different than the expected for order - " . $data['order_number']
             );
         }
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php

@@ -30,6 +30,7 @@ protected function setUp()
 
     /**
      * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoConfigFixture default_store store/information/name Test Store
      */
     public function testGetStoreConfig()
     {
@@ -62,7 +63,8 @@ public function testGetStoreConfig()
     secure_base_url,
     secure_base_link_url,
     secure_base_static_url,
-    secure_base_media_url
+    secure_base_media_url,
+    store_name
   }
 }
 QUERY;
@@ -89,5 +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']);
     }
 }