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

Commit 11ab575

Browse files
authored
Merge branch '2.4.2-develop' into bugfix/#8458-getviewmodel-results-in-null
2 parents 9eb4a55 + 21ebf3f commit 11ab575

File tree

89 files changed

+1410
-823
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1410
-823
lines changed

src/_data/var.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mcp-package: magento/magento-cloud-patches
3131
mcp-release: 1.0.8
3232
mcd-package: magento/magento-cloud-docker
3333
mcd-prod: Magento Cloud Docker
34-
mcd-release: 1.2.0
34+
mcd-release: 1.2.1
3535
mcc-prod: Magento Cloud Components
3636
mcc-package: magento/magento-cloud-components
3737
mcc-release: 1.0.7

src/_data/whats-new.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,32 @@ description: This page contains recent changes that we think you'd like to know
44
We exclude from this list proofreading, spelling checks, and all minor updates.
55
link: "/whats-new.html"
66
thread: "/whatsnew-feed.xml"
7-
updated: Wed Dec 16 16:19:47 2020
7+
updated: Mon Jan 11 15:41:03 2021
88
entries:
9+
- description: Added a [legal disclaimer](https://devdocs.magento.com/compliance/privacy/pi-data-reference-m2.html#customer-data)
10+
to references of the `date_of_birth` attribute of the `customer` database entity.
11+
versions: 2.3.x, 2.4.x
12+
type: Major Update
13+
date: January 8, 2021
14+
link: https://github.com/magento/devdocs/pull/8488
15+
contributor: jeff-matthews
16+
profile: https://github.com/jeff-matthews
17+
- description: Published release notes for [Cloud Docker 1.2.1](https://devdocs.magento.com/cloud/release-notes/mcd-release-notes.html#v121).
18+
versions: 2.4.x
19+
type: Major Update
20+
date: December 22, 2020
21+
link: https://github.com/magento/devdocs/pull/8429
22+
contributor: bdenham
23+
profile: https://github.com/bdenham
24+
- description: Added a new topic with instructions for [reverting from a split database
25+
to a single database](https://devdocs.magento.com/guides/v2.4/config-guide/revert-split-database.html)
26+
implementation.
27+
versions: 2.3.x, 2.4.x
28+
type: New Topic
29+
date: December 21, 2020
30+
link: https://github.com/magento/devdocs/pull/8422
31+
contributor: jeff-matthews
32+
profile: https://github.com/jeff-matthews
933
- description: Added an [example](https://devdocs.magento.com/guides/v2.4/javascript-dev-guide/javascript/requirejs.html)
1034
of overwriting a Knockout JS .html template file in the `requirejs-config.js`
1135
file.

src/_includes/cloud/enable-ssh.md

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,23 @@ If the directory does not exist or has no SSH key files, you must generate at le
3838

3939
If you have at least one SSH key in your directory, add the key to your Magento and GitHub accounts:
4040

41-
- [Add an SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
41+
- [Add an SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) and [test the SSH connection](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/testing-your-ssh-connection).
4242
- [Add your public SSH key to your Magento account](#ssh-add-to-account)
4343

44-
### Test the SSH keys {#test}
45-
46-
After adding the SSH keys, test the SSH connection to GitHub:
47-
48-
1. In the terminal, enter the following command:
49-
50-
```bash
51-
ssh -T git@github.com
52-
```
53-
54-
1. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
55-
56-
1. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
57-
5844
## Add a public SSH key to your Magento account {#ssh-add-to-account}
5945

6046
You can add SSH keys to your account in any of the following ways:
6147

6248
- Using the [{{site.data.var.ece}} CLI](#add-key-cli)
6349
- Using the [{{site.data.var.ece}} Web Interface](#add-key-web)
50+
- Using the [{{site.data.var.ece}} Cloud account Dashboard](#add-key-cloud)
51+
52+
After you add a key, you must [redeploy active Cloud environments](#update-cloud-environments-with-a-new-ssh-key) to upload the key.
6453

6554
### Add your SSH key using the CLI {#add-key-cli}
6655

6756
{:.procedure}
68-
To add an SSH key using the CLI:
57+
To add an SSH key using the [Magento Cloud CLI]({{site.baseurl}}/cloud/reference/cli-ref-topic.html):
6958

7059
1. Open a terminal application on your local workstation.
7160

@@ -118,8 +107,23 @@ To add an SSH key using the Project Web interface:
118107

119108
- Follow the prompts on your screen to complete the task.
120109

121-
{:.bs-callout-tip}
122-
You can view and manage the SSH keys on your account in _Account settings_. In the upper right corner of the Project Web interface, click **your-user-name** > **Account Settings**.
110+
### Add a key from the Cloud Account dashboard {#add-key-cloud}
111+
112+
You can add your SSH public key directly from the Cloud _Account Settings_ page.
113+
114+
1. Open your [Cloud account page](https://accounts.magento.cloud) and log in if required.
115+
1. On the Cloud account dashboard, click the **Account Settings** tab.
116+
1. Under _SSH keys_, click **Add a public key**.
117+
118+
## Update Cloud environments with a new SSH key
119+
120+
After you add an SSH key, redeploy each active Cloud environment to upload the new key.
121+
122+
Use the [Magento Cloud CLI]({{site.baseurl}}/cloud/reference/cli-ref-topic.html) to redeploy the environment:
123+
124+
```bash
125+
magento-cloud redeploy --project <project-name> --host <host-name> --environment <environment-name>
126+
```
123127

124128
## Set global Git variables
125129

src/_includes/graphql/company-team.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ The `CompanyTeam` object contains details about a company team. It contains the
33
Attribute | Data Type | Description
44
--- | --- | ---
55
`description` | String | An optional description of the team
6-
`id` | ID! | A string that contains the encoded team ID
6+
`id` | ID! | The unique ID for a `CompanyTeam` object
77
`name` | String | The display name of the team

src/_includes/graphql/company.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ Attribute | Data type | Description
77
`credit` | CompanyCredit! | The company credit balance
88
`credit_history(filter: CompanyCreditHistoryFilterInput, pageSize: Int = 20, currentPage: Int = 1)` | CompanyCreditHistory! | A history of company credit operations
99
`email` | String | The email address of the company contact
10-
`id` | ID! | The ID assigned to the company
10+
`id` | ID! | The unique ID of a `Company` object
1111
`legal_address` | [CompanyLegalAddress](#CompanyLegalAddress) | The address where the company is registered to conduct business
1212
`legal_name` | String | The full legal name of the company
1313
`name` | String | The name of the company
1414
`payment_methods` | [String] | The list of payment methods available to a company
1515
`reseller_id` | String | The resale number that is assigned to the company for tax reporting purposes
16-
`role(id: ID!)` | [CompanyRole](#CompanyRole) | Returns information about the specified company role
16+
`role(id: ID!)` | [CompanyRole](#CompanyRole) | Returns a company role filtered by the unique ID for a `CompanyRole` object
1717
`roles(pageSize: Int = 20, currentPage: Int = 1 )` | [CompanyRoles!](#CompanyRoles) | Returns the list of company roles
1818
`sales_representative` | [CompanySalesRepresentative](#CompanySalesRepresentative) | The company sales representative
1919
`structure(rootId: ID = 0 depth: Int = 10 )` | [CompanyStructure](#CompanyStructure) | Returns the company structure of teams and customers in depth-first order
20-
`team(id: ID!)` | [CompanyTeam](#CompanyTeam) | Returns the specified company team
21-
`user(id: ID!)` | [Customer]({{page.baseurl}}/graphql/queries/customer.html) | Returns the specified company user
22-
`users(filter: CompanyUsersFilterInput, pageSize: Int = 20, currentPage: Int = 1)`| [CompanyUsers](#CompanyUsers) | Returns the company users that match the specified filter
23-
`vat_id` | String | The value-added tax number that is assigned to the company by some jurisdictions for tax reporting purposes
20+
`team(id: ID!)` | [CompanyTeam](#CompanyTeam) | Returns company team data filtered by the unique ID for a `CompanyTeam` object
21+
`user(id: ID!)` | [Customer]({{page.baseurl}}/graphql/queries/customer.html) | Returns a company user filtered by the unique ID for a `Customer` object
22+
`users(filter: CompanyUsersFilterInput, pageSize: Int = 20, currentPage: Int = 1)`| [CompanyUsers](#CompanyUsers) | Returns a list of company users based on activity status
23+
`vat_tax_id` | String | The value-added tax number that is assigned to the company by some jurisdictions for tax reporting purposes
2424

2525
### CompanyAclResource attributes {#CompanyAclResource}
2626

@@ -29,8 +29,8 @@ The `CompanyAclResource` object can contain the following attributes.
2929
Attribute | Data Type | Description
3030
--- | --- | ---
3131
`children` | [CompanyAclResource!] | An array of sub-resources
32-
`id` | ID! | The ID assigned to the ACL resource
33-
`sort_order` | Int | ACL resource sort order
32+
`id` | ID! | The unique ID for a `CompanyAclResource` object
33+
`sort_order` | Int | The sort order of an ACL resource
3434
`text` | String | The label assigned to the ACL resource
3535

3636
### CompanyAdmin attributes {#CompanyAdmin}
@@ -42,7 +42,7 @@ Attribute | Data Type | Description
4242
`email` | String! | The email address of the company administrator
4343
`firstname` | String! | The company administrator's first name
4444
`gender` | Int | The company administrator's gender (Male - 1, Female - 2, Not Specified - 3)
45-
`id` | ID! | The ID assigned to the company administrator
45+
`id` | ID! | The unique ID for a `CompanyAdmin` object
4646
`job_title` | String | The job title of the company administrator
4747
`lastname` | String! | The company administrator's last name
4848

@@ -105,8 +105,8 @@ The `CompanyLegalAddress` object can contain the following attributes.
105105
Attribute | Data Type | Description
106106
--- | --- | ---
107107
`city` | String! | The city where the company is registered to conduct business
108-
`country_id` | CountryCodeEnum! | Company's country ID. See the [`countries` query]({{page.baseurl}}/graphql/queries/directory-countries.html)
109-
`postcode` | String! | The ZIP/postal code of the company
108+
`country_code` | CountryCodeEnum! | Company's country ID. See the [`countries` query]({{page.baseurl}}/graphql/queries/directory-countries.html)
109+
`postcode` | String! | The company's postal code
110110
`region` | CustomerAddressRegionInput! | An object containing the region name and/or region ID where the company is registered to conduct business
111111
`street` | [String!]! | An array of strings that define the street address where the company is registered to conduct business
112112
`telephone` | String! | The primary phone number of the company.
@@ -117,7 +117,7 @@ The `CompanyRole` object can contain the following attributes.
117117

118118
Attribute | Data Type | Description
119119
--- | --- | ---
120-
`id`| ID! | The ID assigned to the role
120+
`id`| ID! | The unique ID for a `CompanyRole` object
121121
`name` | String | The name assigned to the role
122122
`permissions` | [CompanyAclResource] | A list of permission resources defined for a role
123123
`users_count` | Int | The total number of users assigned the specified role
@@ -129,7 +129,7 @@ The `CompanyRoles` object can contain the following attributes.
129129
Attribute | Data Type | Description
130130
--- | --- | ---
131131
`items` | [CompanyRole]! | A list of company roles that match the specified filter criteria
132-
`page_info` | SearchResultPageInfo | Pagination meta data
132+
`page_info` | SearchResultPageInfo | Pagination metadata
133133
`total_count` | Int! | The total number of roles matching the specified filter
134134

135135
### CompanySalesRepresentative attributes {#CompanySalesRepresentative}
@@ -157,8 +157,8 @@ The `CompanyStructureItem` object can contain the following attributes.
157157
Attribute | Data Type | Description
158158
--- | --- | ---
159159
`entity` | CompanyStructureEntity | A union of [CompanyTeam](#CompanyTeam) and [Customer]({{page.baseurl}}/graphql/queries/customer.html) objects
160-
`id` | ID! | The ID of the item in the hierarchy
161-
`parent_id` | ID | The ID of the parent item in the hierarchy
160+
`id` | ID! | The unique ID for a `CompanyStructureItem` object
161+
`parent_id` | ID | The ID of the parent item in the company hierarchy
162162

163163
### CompanyTeam attributes {#CompanyTeam}
164164

@@ -169,6 +169,6 @@ The `CompanyUsers` object can contain the following attributes.
169169

170170
Attribute | Data Type | Description
171171
--- | --- | ---
172-
`items` | [[Customer]!]({{page.baseurl}}/graphql/queries/customer.html) | An array of `CompanyUser` objects that match the specified search criteria
173-
`page_info` | SearchResultPageInfo | Pagination meta data
172+
`items` | [[Customer]!]({{page.baseurl}}/graphql/queries/customer.html) | An array of `CompanyUser` objects that match the specified filter criteria
173+
`page_info` | SearchResultPageInfo | Pagination metadata
174174
`total_count` | Int! | The number of objects returned

src/_includes/graphql/create-customer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Attribute | Data Type | Description
22
--- | --- | ---
3-
`date_of_birth` | String | The customer’s date of birth
3+
`date_of_birth` | String | The customer’s date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
44
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer’s date of birth
55
`email` | String | The customer’s email address. Required to create a customer
66
`firstname` | String | The customer’s first name. Required to create a customer

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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
5+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
66
`default_billing` | String | The ID assigned to the billing address
77
`default_shipping` | String | The ID assigned to the shipping address
88
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/graphql/customer-input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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
5+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
66
`default_billing` | String | The ID assigned to the billing address
77
`default_shipping` | String | The ID assigned to the shipping address
88
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Attribute | Data Type | Description
1919
`addresses` | {{ customeraddress_text }} | An array containing the customer's shipping and billing addresses
2020
`allow_remote_shopping_assistance` | Boolean! | Indicates whether the customer has enabled remote shopping assistance
2121
`created_at` | String | Timestamp indicating when the account was created
22-
`date_of_birth` | String | The customer's date of birth
22+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
2323
`default_billing` | String | The ID assigned to the billing address
2424
`default_shipping` | String | The ID assigned to the shipping address
2525
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

src/_includes/graphql/customer-output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ 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
5+
`date_of_birth` | String | The customer's date of birth. In keeping with current security and privacy best practices, be sure you are aware of any potential legal and security risks associated with the storage of customers’ full date of birth (month, day, year) along with other personal identifiers, such as full name, before collecting or processing such data.
66
`default_billing` | String | The ID assigned to the billing address
77
`default_shipping` | String | The ID assigned to the shipping address
88
`dob` | String | Deprecated. Use `date_of_birth` instead. The customer's date of birth

0 commit comments

Comments
 (0)