Skip to content

Commit 73c7c99

Browse files
keharperkeharper
authored
Merge branch 'main' into patch-1
2 parents a4f759f + 883699f commit 73c7c99

File tree

13 files changed

+221
-141
lines changed

13 files changed

+221
-141
lines changed

‎.github/workflows/github-pages.yml

Lines changed: 18 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,20 @@
1-
---
2-
name: Github Pages
1+
name: Deploy Gatsby site to Pages
2+
33
on: workflow_dispatch
4-
permissions: {}
5-
jobs:
6-
build-and-deploy:
7-
runs-on: ubuntu-latest
8-
permissions:
9-
actions: read
10-
contents: write
11-
steps:
12-
- uses: actions/checkout@v4
13-
- name: Use Setup Node and Install Dependencies Action
14-
uses: commerce-docs/devsite-install-action@main
15-
with:
16-
node-version-file: '.nvmrc'
17-
cache-dependency-path: 'yarn.lock'
184

19-
- name: Build site
20-
run: yarn build
21-
env:
22-
NODE_OPTIONS: "--max-old-space-size=8192"
23-
PREFIX_PATHS: true # works like --prefix-paths flag for 'gatsby build'
24-
PATH_PREFIX: ${{ github.event.repository.name }}
25-
ADOBE_LAUNCH_SRC: ${{ secrets.AIO_ADOBE_LAUNCH_SRC }}
26-
ADOBE_LAUNCH_SRC_INCLUDE_IN_DEVELOPMENT: ${{ secrets.ADOBE_LAUNCH_SRC_INCLUDE_IN_DEVELOPMENT }}
27-
REPO_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
REPO_OWNER: ${{ github.event.repository.owner.login }}
29-
REPO_NAME: ${{ github.event.repository.name }}
30-
REPO_BRANCH: ${{ github.ref_name }}
31-
GOOGLE_OAUTH_CLIENT_ID: ${{ secrets.GOOGLE_OAUTH_CLIENT_ID }}
32-
GOOGLE_OAUTH_CLIENT_SECRET: ${{ secrets.GOOGLE_OAUTH_CLIENT_SECRET }}
33-
GOOGLE_DOCS_TOKEN: ${{ secrets.GOOGLE_DOCS_TOKEN }}
34-
GOOGLE_DOCS_FOLDER_ID: ${{ secrets.GOOGLE_DOCS_FOLDER_ID }}
35-
- name: Deploy to GH Pages
36-
uses: JamesIves/github-pages-deploy-action@v4
37-
with:
38-
token: ${{ secrets.GITHUB_TOKEN }}
39-
branch: gh-pages # The branch the action should deploy to.
40-
folder: public # The folder the action should deploy.
41-
clean: true # Automatically remove deleted files from deploy branch
42-
- name: GH Pages URL
43-
id: gh-pages-url
44-
run: |
45-
echo "View GH-Pages: $(https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }})"
5+
permissions:
6+
contents: read
7+
pages: write
8+
id-token: write
9+
10+
concurrency:
11+
group: "pages"
12+
cancel-in-progress: false
13+
14+
defaults:
15+
run:
16+
shell: bash
17+
18+
jobs:
19+
call-workflow-deploy-to-pages:
20+
uses: AdobeDocs/commerce-php/.github/workflows/deploy-to-pages_job.yml@main

‎.github/workflows/test-pull-request.yml

Lines changed: 5 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,12 @@
11
---
2-
###########################
3-
###########################
4-
## Pull request testing ##
5-
###########################
6-
###########################
72
name: Validate pull request
83

9-
# Documentation:
10-
# - Workflow: https://help.github.com/en/articles/workflow-syntax-for-github-actions
11-
# - SuperLinter: https://github.com/github/super-linter
12-
# - Link validation: https://github.com/remarkjs/remark-validate-links
13-
14-
######################################################
15-
# Start the job on a pull request to the main branch #
16-
######################################################
174
on: pull_request
185

19-
#################################################
20-
# Disable all permissions on the workflow level #
21-
#################################################
22-
permissions: {}
6+
permissions:
7+
contents: read
8+
statuses: write
239

24-
###############
25-
# Set the Job #
26-
###############
2710
jobs:
28-
lint:
29-
# Set the agent to run on
30-
runs-on: ubuntu-latest
31-
32-
############################################
33-
# Grant status permission for MULTI_STATUS #
34-
############################################
35-
permissions:
36-
contents: read
37-
statuses: write
38-
39-
##################
40-
# Load all steps #
41-
##################
42-
steps:
43-
##########################
44-
# Checkout the code base #
45-
##########################
46-
- name: Checkout Code
47-
uses: actions/checkout@v4
48-
with:
49-
# Full git history is needed to get a proper list of changed files
50-
# within `super-linter`
51-
fetch-depth: 0
52-
- name: Load super-linter configuration
53-
run: cat .github/super-linter.env >> "$GITHUB_ENV"
54-
55-
################################
56-
# Run Linters against code base #
57-
################################
58-
- name: Lint Code Base
59-
#
60-
# Use full version number to avoid cases when a next
61-
# released version is buggy
62-
# About slim image: https://github.com/github/super-linter#slim-image
63-
uses: super-linter/super-linter/slim@v7.2.0
64-
env:
65-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
66-
DEFAULT_BRANCH: main
67-
68-
test:
69-
runs-on: ubuntu-latest
70-
needs: lint
71-
permissions:
72-
contents: read
73-
statuses: write
74-
steps:
75-
- uses: actions/checkout@v4
76-
- name: Use Setup Node and Install Dependencies Action
77-
uses: commerce-docs/devsite-install-action@main
78-
with:
79-
node-version-file: '.nvmrc'
80-
cache-dependency-path: 'yarn.lock'
81-
82-
- name: Check links
83-
run: yarn test
84-
85-
build:
86-
runs-on: ubuntu-latest
87-
needs: test
88-
permissions:
89-
contents: read
90-
statuses: write
91-
steps:
92-
- uses: actions/checkout@v4
93-
- name: Use Setup Node and Install Dependencies Action
94-
uses: commerce-docs/devsite-install-action@main
95-
with:
96-
node-version-file: '.nvmrc'
97-
cache-dependency-path: 'yarn.lock'
98-
99-
- name: Build site
100-
run: yarn build
11+
testing:
12+
uses: AdobeDocs/commerce-php/.github/workflows/validate-pr_job.yml@main

‎src/pages/_images/admin-ui-sdk-logs.png

98.9 KB
Loading

‎src/pages/_images/admin-ui-sdk-sandbox-test-config.png

113 KB
Loading

‎src/pages/_images/admin-ui-sdk-stage-test-config.png

-108 KB
Binary file not shown.

‎src/pages/admin-ui-sdk/configuration.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,19 @@ Set the minimum log level to save. Any logs at this level or higher will be stor
3434

3535
Set the retention period for logs to be cleaned from the database. This field specifies the number of days. By default, the retention period is set to 1 day.
3636

37+
Navigate to **System** > Admin UI SDK > **Admin UI SDK Logs** to check the saved logs.
38+
39+
![Admin UI SDK Logs screen](../_images/admin-ui-sdk-logs.png)
40+
3741
## Sandbox testing
3842

3943
The sandbox testing option provides an environment to test your applications using the Admin UI SDK in a real-world setting. This option will retrieve Production workspace registrations that match the chosen statuses. This environment can be shared with colleagues for collaborative testing before [publishing the application](./publish.md).
4044

41-
![Admin UI SDK staging testing configuration](../_images/admin-ui-sdk-stage-test-config.png)
45+
![Admin UI SDK staging testing configuration](../_images/admin-ui-sdk-sandbox-test-config.png)
4246

4347
1. Select **Yes** from the **Enable testing** menu.
4448

45-
1. Set the **Testing mode** to **Staging**.
49+
1. Set the **Testing mode** to **Sandbox**.
4650

4751
1. Select all app statuses to load.
4852

‎src/pages/admin-ui-sdk/release-notes.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@ keywords:
88

99
# Adobe Commerce Admin UI SDK release notes
1010

11+
## Version 2.3.0
12+
13+
### Release date
14+
15+
March 14, 2025
16+
17+
### Enhancements
18+
19+
* Renamed Staging **Test mode** to Sandbox. <!--- CEXT-4072 -->
20+
21+
* Aligned the **App Status** label with the App Registry. <!--- CEXT-4071 -->
22+
23+
* Added a tooltip to clarify the **Test mode** options. <!--- CEXT-4134 -->
24+
25+
### Bug fixes
26+
27+
* Fixed a REST API order retrieval error that could occur when the Admin UI SDK custom fees module was enabled. <!--- CEXT-4348 -->
28+
29+
* Fixed a timeout issue that could occur when contacting the App Registry. <!--- CEXT-4205 -->
30+
1131
## Version 2.2.0
1232

1333
### Release date

‎src/pages/events/api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ Name | Format | Description
244244
--- | --- | ---
245245
`enabled` | boolean | A `true` value indicates eventing is enabled.
246246
`merchant_id` | string | The merchant's company name. The value can contain alphanumeric characters and underscores only.
247-
`environment_id` | string | A label for your environment.
247+
`environment_id` | string | A label for your environment. The value can contain alphanumeric characters and underscores only.
248248
`provider_id` | string | An event provider ID generated by the [`bin/magento events:create-event-provider` command](./commands.md#create-an-event-provider).
249249
`instance_id` | string | A unique identifier. This value can contain English alphanumeric characters, underscores (_), and hyphens (-) only.
250250
`workspace_configuration` | string | The contents of the workspace configuration file downloaded from the Adobe Developer Console.

‎src/pages/events/module-development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ The contents of the event are similar to the following:
389389

390390
### config.php and env.php
391391

392-
You can also create an `io_events` section in the Commerce [`app/etc/config.php file`](https://experienceleague.adobe.com/docs/commerce-operations/configuration-guide/files/deployment-files.html). As of version of **1.11.0** of Adobe I/O Events for Adobe Commerce, you can also create an `io_events section` in the Commerce [`app/etc/env.php file`](https://experienceleague.adobe.com/en/docs/commerce-operations/configuration-guide/files/deployment-files). Events registered using this mechanism can be disabled from the command line.
392+
You can also create an `io_events` section in the Commerce [`app/etc/config.php file`](https://experienceleague.adobe.com/docs/commerce-operations/configuration-guide/files/deployment-files.html). As of version of **1.11.0** of Adobe I/O Events for Adobe Commerce, you can also create an `io_events` section in the Commerce [`app/etc/env.php file`](https://experienceleague.adobe.com/en/docs/commerce-operations/configuration-guide/files/deployment-files). Events registered using this mechanism can be disabled from the command line.
393393

394394
For example:
395395

‎src/pages/events/release-notes.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ These release notes describe the latest version of Adobe I/O Events for Adobe Co
1212

1313
See [Update Adobe I/O Events for Adobe Commerce](installation.md#update-adobe-io-events-for-adobe-commerce) for upgrade instructions.
1414

15+
## Version 1.11.1
16+
17+
### Release date
18+
19+
February 25, 2025
20+
21+
### Enhancements
22+
23+
* Removed the requirement for Merchant ID and Environment ID to start with letters. <!-- CEXT-4246 -->
24+
1525
## Version 1.11.0
1626

1727
### Release date

0 commit comments

Comments
 (0)