Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit d626955

Browse files
dshevtsovdshevtsov
authored
Merge pull request #6349 from magento/ds_revert-6346
Revert changes made in 6346
2 parents bccab62 + 615a334 commit d626955

25 files changed

+1708
-669
lines changed

‎src/_data/toc/graphql.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ pages:
1616
- label: GraphQL Caching
1717
url: /graphql/caching.html
1818

19+
- label: Filtering with custom attributes
20+
url: /graphql/custom-filters.html
21+
1922
- label: Development
2023
children:
2124
- label: Define the GraphQL schema for a module
@@ -50,6 +53,9 @@ pages:
5053
- label: category query
5154
url: /graphql/queries/category.html
5255

56+
- label: categoryList query
57+
url: /graphql/queries/category-list.html
58+
5359
- label: checkoutAgreements query
5460
url: /graphql/queries/checkout-agreements.html
5561

@@ -74,6 +80,9 @@ pages:
7480
- label: customer query
7581
url: /graphql/queries/customer.html
7682

83+
- label: customerCart query
84+
url: /graphql/queries/customer-cart.html
85+
7786
- label: customerDownloadableProducts query
7887
url: /graphql/queries/customer-downloadable-products.html
7988

@@ -112,9 +121,15 @@ pages:
112121
- label: Using mutations
113122
url: /graphql/mutations/index.html
114123

124+
- label: addBundleProductsToCart mutation
125+
url: /graphql/mutations/add-bundle-products.html
126+
115127
- label: addConfigurableProductsToCart mutation
116128
url: /graphql/mutations/add-configurable-products.html
117129

130+
- label: addDownloadableProductsToCart mutation
131+
url: /graphql/mutations/add-downloadable-products.html
132+
118133
- label: addSimpleProductsToCart mutation
119134
url: /graphql/mutations/add-simple-products.html
120135

@@ -163,6 +178,9 @@ pages:
163178
- label: handlePayflowProResponse mutation
164179
url: /graphql/mutations/handle-payflow-pro-response.html
165180

181+
- label: mergeCarts mutation
182+
url: /graphql/mutations/merge-carts.html
183+
166184
- label: placeOrder mutation
167185
url: /graphql/mutations/place-order.html
168186

‎src/_includes/graphql/cart-object.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
Attribute | Data Type | Description
22
--- | --- | ---
3-
`applied_coupon` | [`AppliedCoupon`][AppliedCoupon] | The `AppliedCoupon` object contains the `code` text attribute, which specifies the coupon code
3+
`applied_coupon` | [`AppliedCoupon`][AppliedCoupon] | Deprecated. Use `applied_coupons` instead
4+
`applied_coupons` | [[`AppliedCoupon`]][AppliedCoupon] | An array of `AppliedCoupon` objects. Each object contains the `code` text attribute, which specifies the coupon code
45
`applied_gift_cards` | [[`AppliedGiftCard`]][AppliedGiftCard] | An array of `AppliedGiftCard` objects. An `AppliedGiftCard` object contains the `code` text attribute, which specifies the gift card code. `applied_gift_cards` is a Commerce-only attribute, defined in the GiftCardAccountGraphQl module
56
`applied_store_credit` | [`AppliedStoreCredit`][AppliedStoreCredit] | Contains store credit information applied to the cart. `applied_store_credit` is a Commerce-only attribute, defined in the CustomerBalanceGraphQl module
67
`available_payment_methods` | [[AvailablePaymentMethod]][AvailablePaymentMethod] | Available payment methods
78
`billing_address` | [BillingCartAddress][BillingCartAddress] | Contains the billing address specified in the customer's cart
89
`email` | String | The customer's email address
10+
`id` | ID! | The ID of the cart
11+
`is_virtual` | Boolean | Indicates whether the cart contains only virtual products
912
`items` | [[CartItemInterface]][CartItemInterface] | Contains the items in the customer's cart
1013
`prices` | [CartPrices][CartPrices] | Contains subtotals and totals
1114
`selected_payment_method` | [SelectedPaymentMethod][SelectedPaymentMethod] | Selected payment method

‎src/_includes/graphql/create-customer.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Attribute | Data Type | Description
22
--- | --- | ---
3-
`dob` | String | The customer’s date of birth
3+
`date_of_birth` | String | The customer’s date of birth
4+
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer’s date of birth
45
`email` | String | The customer’s email address. Required to create a customer
56
`firstname` | String | The customer’s first name. Required to create a customer
67
`gender` | Int | The customer's gender (Male - 1, Female - 2)

‎src/_includes/graphql/customer-address-input.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ Attribute | Data Type | Description
66
--- | --- | ---
77
`city` | String | The city or town
88
`company` | String | The customer's company
9-
`country_id` | String | The customer's country
10-
`custom_attributes` | [CustomerAddressAttributeInput](#customerAddressAttributeInput) | Address custom attributes
9+
`country_code` | String | The customer's country
10+
`country_id` | String | Deprecated. Use `country_code` instead. The customer's country
11+
`custom_attributes` | [CustomerAddressAttributeInput](#customerAddressAttributeInput) | Deprecated. Not applicable for GraphQL
1112
`customer_id` | Int | The customer ID
1213
`default_billing` | Boolean | Indicates whether the address is the default billing address
1314
`default_shipping` | Boolean | Indicates whether the address is the default shipping address
@@ -20,7 +21,7 @@ Attribute | Data Type | Description
2021
`postcode` | String | The customer's ZIP or postal code
2122
`prefix` | String | An honorific, such as Dr., Mr., or Mrs.
2223
`region` | [CustomerAddressRegionInput](#customerAddressRegionInput) | An object that defines the customer's state or province
23-
`region_id` | Int | A number that uniquely identifies the state, province, or other area
24+
`region_id` | Int | Deprecated. Use `region` instead. A number that uniquely identifies the state, province, or other area
2425
`street` | [String] | An array of strings that define the street number and name
2526
`suffix` | String | A value such as Sr., Jr., or III
2627
`telephone` | String | The telephone number
@@ -43,4 +44,4 @@ Attribute | Data Type | Description
4344
--- | --- | ---
4445
`region` | String | The state or province name
4546
`region_code` | String | The address region code
46-
`region_id` | Int | Uniquely identifies the region
47+
`region_id` | Int | Deprecated. Use `region` instead. Uniquely identifies the region

‎src/_includes/graphql/customer-address-output.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ Attribute | Data Type | Description
88
--- | --- | ---
99
`city` | String | The city or town
1010
`company` | String | The customer's company
11-
`country_id` | String | The customer's country
12-
`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeOutput) | Address custom attributes
11+
`country_code` | CountryCodeEnum | The customer's country
12+
`country_id` | String | Deprecated. Use `country_code` instead. The customer's country
13+
`custom_attributes` | [CustomerAddressAttribute](#customerAddressAttributeOutput) | Deprecated. Not applicable for GraphQL
1314
`customer_id` | Int | The customer ID
1415
`default_billing` | Boolean | Indicates whether the address is the default billing address
1516
`default_shipping` | Boolean | Indicates whether the address is the default shipping address
@@ -22,15 +23,15 @@ Attribute | Data Type | Description
2223
`postcode` | String | The customer's ZIP or postal code
2324
`prefix` | String | An honorific, such as Dr., Mr., or Mrs.
2425
`region` | [CustomerAddressRegion](#customerAddressRegionOutput) | An object that defines the customer's state or province
25-
`region_id` | Int | A number that uniquely identifies the state, province, or other area
26+
`region_id` | Int | Deprecated. Use `region` instead. A number that uniquely identifies the state, province, or other area
2627
`street` | [String] | An array of strings that define the street number and name
2728
`suffix` | String | A value such as Sr., Jr., or III
2829
`telephone` | String | The telephone number
2930
`vat_id` | String | The customer's Tax/VAT number (for corporate customers)
3031

3132
### CustomerAddressAttribute attributes {#customerAddressAttributeOutput}
3233

33-
The `CustomerAddressAttribute` object contains the following attributes:
34+
The `CustomerAddressAttribute` output data type has been deprecated because the contents are not applicable for GraphQL. It can contain the following attributes:
3435

3536
Attribute | Data Type | Description
3637
--- | --- | ---
@@ -45,4 +46,4 @@ Attribute | Data Type | Description
4546
--- | --- | ---
4647
`region` | String | The state or province name
4748
`region_code` | String | The address region code
48-
`region_id` | Int | Uniquely identifies the region
49+
`region_id` | Int | Deprecated. Use `region` instead. Uniquely identifies the region

‎src/_includes/graphql/customer-input.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ Attribute | Data Type | Description
22
--- | --- | ---
33
`addresses` | [CustomerAddress](#customerAddressInput) | An array containing the customer's shipping and billing addresses
44
`created_at` | String | Timestamp indicating when the account was created
5+
`date_of_birth` | String | The customer's date of birth
56
`default_billing` | String | The ID assigned to the billing address
67
`default_shipping` | String | The ID assigned to the shipping address
7-
`dob` | String | The customer's date of birth
8+
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
89
`email` | String | The customer's email address
910
`firstname` | String | The customer's first name
1011
`gender` | Int | The customer's gender (Male - 1, Female - 2)
11-
`group_id` | Int | The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
12+
`group_id` | Int | Deprecated. This attribute is not applicable for GraphQL. The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
1213
`id` | Int | The ID assigned to the customer
1314
`is_subscribed` | Boolean | Indicates whether the customer is subscribed to the company's newsletter
1415
`lastname` | String | The customer's family name
@@ -17,4 +18,4 @@ Attribute | Data Type | Description
1718
`suffix` | String | A value such as Sr., Jr., or III
1819
`taxvat` | String | The customer's Tax/VAT number (for corporate customers)
1920

20-
{% include graphql/customer-address-input.md %}
21+
{% include graphql/customer-address-input.md %}

‎src/_includes/graphql/customer-output.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ Attribute | Data Type | Description
22
--- | --- | ---
33
`addresses` | [CustomerAddress](#customerAddressOutput) | An array containing the customer's shipping and billing addresses
44
`created_at` | String | Timestamp indicating when the account was created
5+
`date_of_birth` | String | The customer's date of birth
56
`default_billing` | String | The ID assigned to the billing address
67
`default_shipping` | String | The ID assigned to the shipping address
7-
`dob` | String | The customer's date of birth
8+
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth
89
`email` | String | The customer's email address
910
`firstname` | String | The customer's first name
1011
`gender` | Int | The customer's gender (Male - 1, Female - 2)
11-
`group_id` | Int | The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
12+
`group_id` | Int | Deprecated. This attribute is not applicable for GraphQL. The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)
1213
`id` | Int | The ID assigned to the customer
1314
`is_subscribed` | Boolean | Indicates whether the customer is subscribed to the company's newsletter
1415
`lastname` | String | The customer's family name
1516
`middlename` |String | The customer's middle name
1617
`prefix` | String | An honorific, such as Dr., Mr., or Mrs.
1718
`suffix` | String | A value such as Sr., Jr., or III
1819
`taxvat` | String | The customer's Tax/VAT number (for corporate customers)
20+
`wishlist` | Wishlist! | Contains the contents of the customer's wish lists
1921

20-
{% include graphql/customer-address-output.md %}
22+
{% include graphql/customer-address-output.md %}

‎src/guides/v2.3/graphql/caching.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ The definitions for some queries include cache tags. Full page caching uses thes
1111

1212
Magento caches the following queries:
1313

14-
* `category`
14+
* `category` (deprecated)
15+
* `categoryList`
1516
* `cmsBlocks`
1617
* `cmsPage`
1718
* `products`

‎src/guides/v2.3/graphql/develop/create-graphqls-file.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ The following example shows the `products` query. The `type` is defined as a `Qu
2828
type Query {
2929
products (
3030
search: String
31-
filter: ProducFilterInput
31+
filter: ProductAttributeFilterInput
3232
pageSize: Int = 20
3333
currentPage: Int = 1
34-
sort: ProductSortInput
34+
sort: ProductAttributeSortInput
3535
): Products @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Products")
3636
}
3737
```

0 commit comments

Comments
 (0)