Skip to content

Commit c623b57

Browse files
committed
Merge remote-tracking branch 'origin/DOC-475-misc-ce' into graphql-doc-changes
2 parents 11c77ca + f493c71 commit c623b57

File tree

15 files changed

+358
-358
lines changed

15 files changed

+358
-358
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
# See COPYING.txt for license details.
33

44
type Query {
5-
checkoutAgreements: [CheckoutAgreement] @resolver(class: "Magento\\CheckoutAgreementsGraphQl\\Model\\Resolver\\CheckoutAgreements") @doc(description: "The Checkout Agreements information")
5+
checkoutAgreements: [CheckoutAgreement] @resolver(class: "Magento\\CheckoutAgreementsGraphQl\\Model\\Resolver\\CheckoutAgreements") @doc(description: "Return Terms and Conditions configuration information.")
66
}
77

8-
type CheckoutAgreement @doc(description: "Defines all Checkout Agreement information") {
9-
agreement_id: Int! @doc(description: "Checkout Agreement identifier")
10-
name: String! @doc(description: "Checkout Agreement name")
11-
content: String! @doc(description: "Checkout Agreement content")
12-
content_height: String @doc(description: "Checkout Agreement content height")
13-
checkbox_text: String! @doc(description: "Checkout Agreement checkbox text")
14-
is_html: Boolean! @doc(description: "Is Checkout Agreement content in HTML format")
15-
mode: CheckoutAgreementMode!
8+
type CheckoutAgreement @doc(description: "Defines details about an individual checkout agreement.") {
9+
agreement_id: Int! @doc(description: "The ID for a checkout agreement.")
10+
name: String! @doc(description: "The name given to the condition.")
11+
content: String! @doc(description: "Required. The text of the agreement.")
12+
content_height: String @doc(description: "The height of the text box where the Terms and Conditions statement appears during checkout.")
13+
checkbox_text: String! @doc(description: "The checkbox text for the checkout agreement.")
14+
is_html: Boolean! @doc(description: "Indicates whether the `content` text is in HTML format.")
15+
mode: CheckoutAgreementMode! @doc(description: "Indicates whether agreements are accepted automatically or manually.")
1616
}
1717

18-
enum CheckoutAgreementMode {
19-
AUTO
20-
MANUAL
18+
enum CheckoutAgreementMode @doc(description: "Indicates how agreements are accepted.") {
19+
AUTO @doc(description: "Conditions are automatically accepted upon checkout.")
20+
MANUAL @doc(description: "Shoppers must manually accept the conditions to place an order.")
2121
}
Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
# Copyright © Magento, Inc. All rights reserved.
22
# See COPYING.txt for license details.
3-
type StoreConfig @doc(description: "The type contains information about a store config") {
4-
front : String @doc(description: "Default Web URL")
5-
cms_home_page : String @doc(description: "CMS Home Page")
6-
no_route : String @doc(description: "Default No-route URL")
7-
cms_no_route : String @doc(description: "CMS No Route Page")
8-
cms_no_cookies : String @doc(description: "CMS No Cookies Page")
9-
show_cms_breadcrumbs : Int @doc(description: "Show Breadcrumbs for CMS Pages")
3+
type StoreConfig {
4+
front : String @doc(description: "The landing page that is associated with the base URL.")
5+
cms_home_page : String @doc(description: "The name of the CMS page that identifies the home page for the store.")
6+
no_route : String @doc(description: "The default page that displays when a 404 'Page not Found' error occurs.")
7+
cms_no_route : String @doc(description: "A specific CMS page that displays when a 404 'Page Not Found' error occurs.")
8+
cms_no_cookies : String @doc(description: "A specific CMS page that displays when cookies are not enabled for the browser.")
9+
show_cms_breadcrumbs : Int @doc(description: "Indicates whether a breadcrumb trail appears on all CMS pages in the catalog. 0 (No) or 1 (Yes).")
1010
}
1111

1212

1313
type Query {
1414
cmsPage (
15-
id: Int @doc(description: "Id of the CMS page") @deprecated(reason: "The `id` is deprecated. Use `identifier` instead.") @doc(description: "The CMS page query returns information about a CMS page")
16-
identifier: String @doc(description: "Identifier of the CMS page")
17-
): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "The CMS page query returns information about a CMS page") @cache(cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Page\\Identity")
15+
id: Int @doc(description: "The ID of the CMS page.") @deprecated(reason: "Use `identifier` instead.")
16+
identifier: String @doc(description: "The identifier of the CMS page.")
17+
): CmsPage @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Page") @doc(description: "Return details about a CMS page.") @cache(cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Page\\Identity")
1818
cmsBlocks (
19-
identifiers: [String] @doc(description: "Identifiers of the CMS blocks")
20-
): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Blocks") @doc(description: "The CMS block query returns information about CMS blocks") @cache(cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Block\\Identity")
19+
identifiers: [String] @doc(description: "An array of CMS block IDs.")
20+
): CmsBlocks @resolver(class: "Magento\\CmsGraphQl\\Model\\Resolver\\Blocks") @doc(description: "Return information about CMS blocks.") @cache(cacheIdentity: "Magento\\CmsGraphQl\\Model\\Resolver\\Block\\Identity")
2121
}
2222

23-
type CmsPage implements RoutableInterface @doc(description: "CMS page defines all CMS page information") {
24-
identifier: String @doc(description: "Identifier of the CMS page")
25-
url_key: String @doc(description: "URL key of CMS page")
26-
title: String @doc(description: "CMS page title")
27-
content: String @doc(description: "CMS page content")
28-
content_heading: String @doc(description: "CMS page content heading")
29-
page_layout: String @doc(description: "CMS page content heading")
30-
meta_title: String @doc(description: "CMS page meta title")
31-
meta_description: String @doc(description: "CMS page meta description")
32-
meta_keywords: String @doc(description: "CMS page meta keywords")
23+
type CmsPage implements RoutableInterface @doc(description: "Contains details about a CMS page.") {
24+
identifier: String @doc(description: "The ID of a CMS page.")
25+
url_key: String @doc(description: "The URL key of the CMS page, which is often based on the `content_heading`.")
26+
title: String @doc(description: "The name that appears in the breadcrumb trail navigation and in the browser title bar and tab.")
27+
content: String @doc(description: "The content of the CMS page in raw HTML.")
28+
content_heading: String @doc(description: "The heading that displays at the top of the CMS page.")
29+
page_layout: String @doc(description: "The design layout of the page, indicating the number of columns and navigation features used on the page.")
30+
meta_title: String @doc(description: "A page title that is indexed by search engines and appears in search results listings.")
31+
meta_description: String @doc(description: "A brief description of the page for search results listings.")
32+
meta_keywords: String @doc(description: "A brief description of the page for search results listings.")
3333
}
3434

35-
type CmsBlocks @doc(description: "CMS blocks information") {
36-
items: [CmsBlock] @doc(description: "An array of CMS blocks")
35+
type CmsBlocks @doc(description: "Contains an array CMS block items.") {
36+
items: [CmsBlock] @doc(description: "An array of CMS blocks.")
3737
}
3838

39-
type CmsBlock @doc(description: "CMS block defines all CMS block information") {
40-
identifier: String @doc(description: "CMS block identifier")
41-
title: String @doc(description: "CMS block title")
42-
content: String @doc(description: "CMS block content")
39+
type CmsBlock @doc(description: "Contains details about a specific CMS block.") {
40+
identifier: String @doc(description: "The CMS block identifier.")
41+
title: String @doc(description: "The title assigned to the CMS block.")
42+
content: String @doc(description: "The content of the CMS block in raw HTML.")
4343
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@
22
# See COPYING.txt for license details.
33

44
type Query {
5-
currency: Currency @resolver(class: "Magento\\DirectoryGraphQl\\Model\\Resolver\\Currency") @doc(description: "The currency query returns information about store currency.") @cache(cacheable: false)
5+
currency: Currency @resolver(class: "Magento\\DirectoryGraphQl\\Model\\Resolver\\Currency") @doc(description: "Return information about the store's currency.") @cache(cacheable: false)
66
countries: [Country] @resolver(class: "Magento\\DirectoryGraphQl\\Model\\Resolver\\Countries") @doc(description: "The countries query provides information for all countries.") @cache(cacheable: false)
77
country (id: String): Country @resolver(class: "Magento\\DirectoryGraphQl\\Model\\Resolver\\Country") @doc(description: "The countries query provides information for a single country.") @cache(cacheable: false)
88
}
99

1010
type Currency {
11-
base_currency_code: String
12-
base_currency_symbol: String
11+
base_currency_code: String @doc(description: "The base currency set for the store, such as USD.")
12+
base_currency_symbol: String @doc(description: "The symbol for the specified base currency, such as $.")
1313
default_display_currecy_code: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_code`.")
14-
default_display_currency_code: String
15-
default_display_currecy_symbol: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_symbol`.")
16-
default_display_currency_symbol: String
17-
available_currency_codes: [String]
18-
exchange_rates: [ExchangeRate]
14+
default_display_currency_code: String @doc(description: "The currency that is displayed by default, such as USD.")
15+
default_display_currecy_symbol: String @deprecated(reason: "Symbol was missed. Use `default_display_currency_code`.")
16+
default_display_currency_symbol: String @doc(description: "The currency symbol that is displayed by default, such as $.")
17+
available_currency_codes: [String] @doc(description: "An array of three-letter currency codes accepted by the store, such as USD and EUR.")
18+
exchange_rates: [ExchangeRate] @doc(description: "An array of exchange rates for currencies defined in the store.")
1919
}
2020

21-
type ExchangeRate {
22-
currency_to: String
23-
rate: Float
21+
type ExchangeRate @doc(description: "Lists the exchange rate.") {
22+
currency_to: String @doc(description: "Specifies the store’s default currency to exchange to.")
23+
rate: Float @doc(description: "The exchange rate for the store’s default currency.")
2424
}
2525

2626
type Country {
2727
id: String @doc(description: "The unique ID for a `Country` object.")
28-
two_letter_abbreviation: String
29-
three_letter_abbreviation: String
30-
full_name_locale: String
31-
full_name_english: String
32-
available_regions: [Region]
28+
two_letter_abbreviation: String @doc(description: "The two-letter abbreviation of the country, such as US.")
29+
three_letter_abbreviation: String @doc(description: "The three-letter abbreviation of the country, such as USA.")
30+
full_name_locale: String @doc(description: "The name of the country in the current locale.")
31+
full_name_english: String @doc(description: "The name of the country in English.")
32+
available_regions: [Region] @doc(description: "An array of regions within a particular country.")
3333
}
3434

3535
type Region {
3636
id: Int @doc(description: "The unique ID for a `Region` object.")
37-
code: String
38-
name: String
37+
code: String @doc(description: "The two-letter code for the region, such as TX for Texas.")
38+
name: String @doc(description: "The name of the region, such as Texas.")
3939
}

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@
22
# See COPYING.txt for license details.
33

44
type Query {
5-
customAttributeMetadata(attributes: [AttributeInput!]!): CustomAttributeMetadata @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata") @doc(description: "The customAttributeMetadata query returns the attribute type, given an attribute code and entity type") @cache(cacheable: false)
5+
customAttributeMetadata(attributes: [AttributeInput!]! @doc(description: "An input object that specifies the attribute code and entity type to search.")): CustomAttributeMetadata @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\CustomAttributeMetadata") @doc(description: "Return the attribute type, given an attribute code and entity type.") @cache(cacheable: false)
66
}
77

8-
type CustomAttributeMetadata @doc(description: "CustomAttributeMetadata defines an array of attribute_codes and entity_types") {
9-
items: [Attribute] @doc(description: "An array of attributes")
8+
type CustomAttributeMetadata @doc(description: "Defines an array of custom attributes.") {
9+
items: [Attribute] @doc(description: "An array of attributes.")
1010
}
1111

12-
type Attribute @doc(description: "Attribute contains the attribute_type of the specified attribute_code and entity_type") {
12+
type Attribute @doc(description: "Contains details about the attribute, including the code and type.") {
1313
attribute_code: String @doc(description: "The unique identifier for an attribute code. This value should be in lowercase letters without spaces.")
14-
entity_type: String @doc(description: "The type of entity that defines the attribute")
15-
attribute_type: String @doc(description: "The data type of the attribute")
16-
input_type: String @doc(description: "The frontend input type of the attribute")
14+
entity_type: String @doc(description: "The type of entity that defines the attribute.")
15+
attribute_type: String @doc(description: "The data type of the attribute.")
16+
input_type: String @doc(description: "The frontend input type of the attribute.")
1717
attribute_options: [AttributeOption] @resolver(class: "Magento\\EavGraphQl\\Model\\Resolver\\AttributeOptions") @doc(description: "Attribute options list.")
18-
storefront_properties: StorefrontProperties @doc(description: "Contains details about the storefront properties configured for the attribute")
18+
storefront_properties: StorefrontProperties @doc(description: "Details about the storefront properties configured for the attribute.")
1919
}
2020

21-
type StorefrontProperties {
22-
use_in_product_listing: Boolean @doc(description: "Indicates whether the attribute is displayed in product listings")
23-
position: Int @doc(description: "The relative position of the attribute in the layered navigation block")
24-
visible_on_catalog_pages: Boolean @doc(description: "Indicates whether the attribute is displayed on product pages")
25-
use_in_layered_navigation: UseInLayeredNavigationOptions @doc(description: "Indicates whether the attribute is filterable with results, without results, or not at all")
26-
use_in_search_results_layered_navigation: Boolean @doc(description: "Indicates whether the attribute can be used in layered navigation on search results pages")
21+
type StorefrontProperties @doc(description: "Indicates where an attribute can be displayed.") {
22+
use_in_product_listing: Boolean @doc(description: "Indicates whether the attribute is displayed in product listings.")
23+
position: Int @doc(description: "The relative position of the attribute in the layered navigation block.")
24+
visible_on_catalog_pages: Boolean @doc(description: "Indicates whether the attribute is displayed on product pages.")
25+
use_in_layered_navigation: UseInLayeredNavigationOptions @doc(description: "Indicates whether the attribute is filterable with results, without results, or not at all.")
26+
use_in_search_results_layered_navigation: Boolean @doc(description: "Indicates whether the attribute can be used in layered navigation on search results pages.")
2727
}
2828

29-
enum UseInLayeredNavigationOptions {
29+
enum UseInLayeredNavigationOptions @doc(description: "Defines whether the attribute is filterable in layered navigation.") {
3030
NO
3131
FILTERABLE_WITH_RESULTS
3232
FILTERABLE_NO_RESULT
3333
}
3434

35-
type AttributeOption @doc(description: "Attribute option.") {
36-
label: String @doc(description: "Attribute option label.")
37-
value: String @doc(description: "Attribute option value.")
35+
type AttributeOption @doc(description: "Defines an attribute option.") {
36+
label: String @doc(description: "The label assigned to the attribute option.")
37+
value: String @doc(description: "The attribute option value.")
3838
}
3939

40-
input AttributeInput @doc(description: "AttributeInput specifies the attribute_code and entity_type to search") {
40+
input AttributeInput @doc(description: "Defines the attribute characteristics to search for the `attribute_code` and `entity_type` to search.") {
4141
attribute_code: String @doc(description: "The unique identifier for an attribute code. This value should be in lowercase letters without spaces.")
42-
entity_type: String @doc(description: "The type of entity that defines the attribute")
42+
entity_type: String @doc(description: "The type of entity that defines the attribute.")
4343
}

0 commit comments

Comments
 (0)