merge develop into standard product feature branch by sf-emmyzhang · Pull Request #2626 · SalesforceCommerceCloud/pwa-kit

sf-emmyzhang · 2025-06-23T21:23:47Z

Description

Merge develop into feature branch to keep it in sync with the latest.

Types of Changes

Bug fix (non-breaking change that fixes an issue)
New feature (non-breaking change that adds functionality)
Documentation update
Breaking change (could cause existing functionality to not work as expected)
Other changes (non-breaking changes that does not fit any of the above)

Breaking changes include:

Removing a public function or component or prop

Adding a required argument to a function

Changing the data type of a function parameter or return value

Adding a new peer dependency to package.json

Changes

(change1)

How to Test-Drive This PR

(step1)

Checklists

General

Changes are covered by test cases
CHANGELOG.md updated with a short description of changes (not required for documentation updates)

Accessibility Compliance

You must check off all items in one of the follow two lists:

There are no changes to UI

or...

Changes were tested with a Screen Reader (iOS VoiceOver or Android Talkback) and had no issues
Changes comply with WCAG 2.0 guidelines levels A and AA
Changes to common UI patterns and interactions comply with WAI-ARIA best practices

Localization

Changes include a UI text update in the Retail React App (which requires translation)

… PWA kit.

…anges to email confirmation modal code

…esting Library ElementError: Found multiple elements with the text: /check your email/i

…ursor-unit-test-rules-v3 @W-18677509 feat: Create Initial set of cursor rules

Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com>

…20_fix-einstein-add-to-cart [Einstein] Fix `addToCart` payload @@W-18647820@@

Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com>

…missing-sdk-clients @W-18568190@ - Handle missing SDK Clients in CommerceApiProviders

…-email-modal-8 @W-17599234 - Ensure voiceover announces contents of the email confirmation modal

… (@W-18764173@) (#2575) * Improve e2e tests and Tracking Consent banner handling * Clean up * More clean up * Remove spacing changes * PR Feedback * Remove comments

* update translations

…ules-only @W-18800010 Improve unit test rules

* Ensure only requests to /shopper/auth/ are allowed by the SLAS private client proxy * Remove console.logs * Stop swallowing errors from SLAS * Update CHANGELOG.md * Fix login and logout * Remove console logs * Lint * Add and fix tests * Cleanup regex

cc-prodsec · 2025-06-23T21:23:57Z

🎉 Snyk checks have passed. No issues have been found so far.

✅ security/snyk check is complete. No issues have been found. (View Details)

✅ license/snyk check is complete. No issues have been found. (View Details)

* Support standard product on PDP @W-12360908 (#2518) * update handleAddToCart and validate orderability * remove bundle changes, template test, and project config * add fallback if no image * linting * add validateOrderability tests * reorganize tests * fix lint errors * update validateOrderability logic * add product-detail tests * fix modal image link * add modal tests * changelog * pr suggestions * Handle SDK Client not initialized * Added tests for useResolvedClient * Handle missing SDK Client ShopperContext * ShopperCustomers - Handle SDK Client no init * ShopperExperience - Handle missing SDK Client * ShopperGiftCertificates - Handle missing SDK Client * ShopperLogin: Handle missing SDK client * ShopperOrders - Handle Missing SDK Client * ShopperProducts: Handle missing SDK Client * ShopperPromotions: Handle missing SDK client * ShopperSearch - Handle missing SDK Client * ShopperSEO: Handle missing SDK Client * ShopperStores: Handle missing SDK Client * Fix linting errors * Update useResolvedClient tests * Update changelog * Update changelog * Extract CLIENT_KEY literal to constnt * Remove additional hook for client validation * Fix linting * Add comments * rename apiClients variable to add clarity Co-authored-by: Kevin He <kevin.he@salesforce.com> Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> * update variable name for apiClients * Update sample query implementation in query.ts * Initial Commit Follow `plugin_einstein_api` implementation for event data creation. * Update CHANGELOG.md * Add some additional tests * PR Feedback * Fix bar reference to master.variantId * feat: cursor rules for unit tests * Update change log * Support standard product on PDP @W-12360908 (#2518) * update handleAddToCart and validate orderability * remove bundle changes, template test, and project config * add fallback if no image * linting * add validateOrderability tests * reorganize tests * fix lint errors * update validateOrderability logic * add product-detail tests * fix modal image link * add modal tests * changelog * pr suggestions * Resolve merge conflict * Update files with conflicts * omg so we're not adding these * merge develop into standard product feature branch (#2626) * Handle SDK Client not initialized * Added tests for useResolvedClient * Handle missing SDK Client ShopperContext * ShopperCustomers - Handle SDK Client no init * ShopperExperience - Handle missing SDK Client * ShopperGiftCertificates - Handle missing SDK Client * ShopperLogin: Handle missing SDK client * ShopperOrders - Handle Missing SDK Client * ShopperProducts: Handle missing SDK Client * ShopperPromotions: Handle missing SDK client * ShopperSearch - Handle missing SDK Client * ShopperSEO: Handle missing SDK Client * ShopperStores: Handle missing SDK Client * Fix linting errors * Update useResolvedClient tests * Update changelog * implemented the voiceover feature for the email confirmation modal on PWA kit. * Update changelog * Extract CLIENT_KEY literal to constnt * updated the chanege log file to point to current changes and saved changes to email confirmation modal code * linted the files and built translations * changed role and aria label tags to solve unsuccessful check issues * Implemented changes to create more successful checks after facing a testing Library ElementError: Found multiple elements with the text: /check your email/i * Linted my files * Remove additional hook for client validation * Fix linting * Add comments * rename apiClients variable to add clarity Co-authored-by: Kevin He <kevin.he@salesforce.com> Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> * update variable name for apiClients * linted more files to fix unsuccessful check error * linted more files to fix unsuccessful check error * Update packages/template-retail-react-app/CHANGELOG.md Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> * taking off the visible focus outline around the modal border * Initial Commit Follow `plugin_einstein_api` implementation for event data creation. * Update CHANGELOG.md * Update CHANGELOG.md * Add some additional tests * PR Feedback * adding an a11y tag to changes made docuemented in the change log reading document * Fix bar reference to master.variantId * removed redundant aria label that repeating email confirmation title * mitigating the need for additional translations * feat: cursor rules for unit tests * Update packages/template-retail-react-app/CHANGELOG.md Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> * Update packages/template-retail-react-app/CHANGELOG.md Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> * Update change log * Fixing bad merge * Update sample query implementation in query.ts * [Fix E2E Tests] Improve E2E Test and Tracking Consent Banner Handling (@W-18764173@) (#2575) * Improve e2e tests and Tracking Consent banner handling * Clean up * More clean up * Remove spacing changes * PR Feedback * Remove comments * rules only * Update translations (#2616) * update translations * @W-18541294@ Private client proxy updates (#2608) * Ensure only requests to /shopper/auth/ are allowed by the SLAS private client proxy * Remove console.logs * Stop swallowing errors from SLAS * Update CHANGELOG.md * Fix login and logout * Remove console logs * Lint * Add and fix tests * Cleanup regex --------- Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> Signed-off-by: Ben Chypak <bchypak@mobify.com> Co-authored-by: Jainam Sheth <j.sheth@salesforce.com> Co-authored-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> Co-authored-by: Larnelle Ankunda <lankunda@salesforce.com> Co-authored-by: Kevin He <kevin.he@salesforce.com> Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Co-authored-by: Ben Chypak <bchypak@salesforce.com> Co-authored-by: Ben Chypak <bchypak@mobify.com> Co-authored-by: Shailesh Zirpe <szirpe+sf@salesforce.com> Co-authored-by: Shailesh Zirpe <42553862+szirpesf@users.noreply.github.com> Co-authored-by: Adam Raya <adamraya@users.noreply.github.com> Co-authored-by: Alex Vuong <alex.vuong@salesforce.com> Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * @W-12360935 Modify the Product Card to support standard products (#2581) * remove 'edit'for std prd | Add unit tests * update changelog * lint fixes * show Edit button on bundleProducts * handle empty product bundles * better determination of if-standardProduct --------- Signed-off-by: sf-shikhar-prasoon <214730309+sf-shikhar-prasoon@users.noreply.github.com> * udpate changelog to resolve conflict * udpate changelog to resolve conflict 2 * udpate changelog to resolve conflict 3 * oops * Merge develop into standard-product-support (#2633) * Handle SDK Client not initialized * Added tests for useResolvedClient * Handle missing SDK Client ShopperContext * ShopperCustomers - Handle SDK Client no init * ShopperExperience - Handle missing SDK Client * ShopperGiftCertificates - Handle missing SDK Client * ShopperLogin: Handle missing SDK client * ShopperOrders - Handle Missing SDK Client * ShopperProducts: Handle missing SDK Client * ShopperPromotions: Handle missing SDK client * ShopperSearch - Handle missing SDK Client * ShopperSEO: Handle missing SDK Client * ShopperStores: Handle missing SDK Client * Fix linting errors * Update useResolvedClient tests * Update changelog * implemented the voiceover feature for the email confirmation modal on PWA kit. * Update changelog * Extract CLIENT_KEY literal to constnt * updated the chanege log file to point to current changes and saved changes to email confirmation modal code * linted the files and built translations * changed role and aria label tags to solve unsuccessful check issues * Implemented changes to create more successful checks after facing a testing Library ElementError: Found multiple elements with the text: /check your email/i * Linted my files * Remove additional hook for client validation * Fix linting * Add comments * rename apiClients variable to add clarity Co-authored-by: Kevin He <kevin.he@salesforce.com> Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> * update variable name for apiClients * linted more files to fix unsuccessful check error * linted more files to fix unsuccessful check error * Update packages/template-retail-react-app/CHANGELOG.md Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> * taking off the visible focus outline around the modal border * Initial Commit Follow `plugin_einstein_api` implementation for event data creation. * Update CHANGELOG.md * Update CHANGELOG.md * Add some additional tests * PR Feedback * adding an a11y tag to changes made docuemented in the change log reading document * Fix bar reference to master.variantId * removed redundant aria label that repeating email confirmation title * mitigating the need for additional translations * feat: cursor rules for unit tests * Update packages/template-retail-react-app/CHANGELOG.md Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> * Update packages/template-retail-react-app/CHANGELOG.md Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> * Update change log * Fixing bad merge * Update sample query implementation in query.ts * [Fix E2E Tests] Improve E2E Test and Tracking Consent Banner Handling (@W-18764173@) (#2575) * Improve e2e tests and Tracking Consent banner handling * Clean up * More clean up * Remove spacing changes * PR Feedback * Remove comments * rules only * Update translations (#2616) * update translations * @W-18541294@ Private client proxy updates (#2608) * Ensure only requests to /shopper/auth/ are allowed by the SLAS private client proxy * Remove console.logs * Stop swallowing errors from SLAS * Update CHANGELOG.md * Fix login and logout * Remove console logs * Lint * Add and fix tests * Cleanup regex * skip changelog --------- Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> Signed-off-by: Ben Chypak <bchypak@mobify.com> Co-authored-by: Jainam Sheth <j.sheth@salesforce.com> Co-authored-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> Co-authored-by: Larnelle Ankunda <lankunda@salesforce.com> Co-authored-by: Kevin He <kevin.he@salesforce.com> Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Co-authored-by: Ben Chypak <bchypak@salesforce.com> Co-authored-by: Ben Chypak <bchypak@mobify.com> Co-authored-by: Shailesh Zirpe <szirpe+sf@salesforce.com> Co-authored-by: Shailesh Zirpe <42553862+szirpesf@users.noreply.github.com> Co-authored-by: Adam Raya <adamraya@users.noreply.github.com> Co-authored-by: Alex Vuong <alex.vuong@salesforce.com> Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * Support standard product as a child item in bundles @W-18790730 (#2574) * init commit * skip variation check for standard product * update modal logic * add product view test * add to cart modal test * add product detail test * update add to cart modal test * add product util test * update changelog * fix edit bundle * lint * Handle standard product shape in sendAddToCart * Update CHANGELOG.md * Support standard product as a child item in sets @W-18790730 (#2636) * fix adding set to cart * updae changelog * udpate util test * Add test * Lint tests * @W-18767088 refactor add to cart * @W-18767088 refactor add to cart * @W-18767088 fix lint errors * @W-18767088 do not move handleChildProductValidation * @W-12360935 2nd PR- fixing Edit button appearing briefly for standard products (#2649) * fix Edit button appearing briefly * fix tests * @W-18767088 utils rename * Revert CHANGELOG.md Signed-off-by: sf-emmyzhang <emmyzhang@salesforce.com> * increase bundle size for ci error * update use add to cart modal unit test * revert auto merge change * add image placeholder todo * rename bundleChildVariant * revert refactor work * add bundle test * lint * update test * lint * Handle out of stock for standard product * tests and linting * handle lack of type --------- Signed-off-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com> Signed-off-by: Ben Chypak <bchypak@mobify.com> Signed-off-by: sf-shikhar-prasoon <214730309+sf-shikhar-prasoon@users.noreply.github.com> Signed-off-by: Kyle Wright <30636085+sf-kyle-wright@users.noreply.github.com> Signed-off-by: sf-emmyzhang <emmyzhang@salesforce.com> Co-authored-by: Jainam Sheth <j.sheth@salesforce.com> Co-authored-by: Jainam Sheth <99490559+shethj@users.noreply.github.com> Co-authored-by: Kevin He <kevin.he@salesforce.com> Co-authored-by: Ben Chypak <bchypak@salesforce.com> Co-authored-by: Shailesh Zirpe <szirpe+sf@salesforce.com> Co-authored-by: Larnelle Ankunda <lankunda@salesforce.com> Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Co-authored-by: Ben Chypak <bchypak@mobify.com> Co-authored-by: Shailesh Zirpe <42553862+szirpesf@users.noreply.github.com> Co-authored-by: Adam Raya <adamraya@users.noreply.github.com> Co-authored-by: Alex Vuong <alex.vuong@salesforce.com> Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: sf-shikhar-prasoon <214730309+sf-shikhar-prasoon@users.noreply.github.com> Co-authored-by: Jang ho Jung <jangho.jung@salesforce.com> Co-authored-by: Kyle Wright <kyle.wright@salesforce.com> Co-authored-by: jeremy-jung1 <140001271+jeremy-jung1@users.noreply.github.com> Co-authored-by: Kyle Wright <30636085+sf-kyle-wright@users.noreply.github.com>

shethj and others added 30 commits June 9, 2025 08:17

Handle SDK Client not initialized

23c9db0

Added tests for useResolvedClient

2c19d6e

Handle missing SDK Client ShopperContext

b938450

ShopperCustomers - Handle SDK Client no init

f72e1d0

ShopperExperience - Handle missing SDK Client

0e5bbac

ShopperGiftCertificates - Handle missing SDK Client

d1c7b0f

ShopperLogin: Handle missing SDK client

b1794a6

ShopperOrders - Handle Missing SDK Client

2e59f77

ShopperProducts: Handle missing SDK Client

cca81f1

ShopperPromotions: Handle missing SDK client

ecfd927

ShopperSearch - Handle missing SDK Client

9dcf72c

ShopperSEO: Handle missing SDK Client

34bba65

ShopperStores: Handle missing SDK Client

3968f53

Fix linting errors

cb86ce5

Update useResolvedClient tests

7660fde

Update changelog

91c6909

Merge branch 'develop' into feature/handle-missing-sdk-clients

16243f7

implemented the voiceover feature for the email confirmation modal on…

cdbc939

… PWA kit.

Update changelog

bec77e6

Extract CLIENT_KEY literal to constnt

83b6f12

updated the chanege log file to point to current changes and saved ch…

c88c1ab

…anges to email confirmation modal code

Merge branch 'develop' into feature/handle-missing-sdk-clients

50ae895

linted the files and built translations

4e31416

changed role and aria label tags to solve unsuccessful check issues

8452493

Implemented changes to create more successful checks after facing a t…

859b62d

…esting Library ElementError: Found multiple elements with the text: /check your email/i

Linted my files

bc60eeb

Remove additional hook for client validation

36dd723

Fix linting

0273032

Add comments

f3b2787

Merge branch 'develop' into feature/handle-missing-sdk-clients

524aa80

bendvc and others added 25 commits June 16, 2025 15:03

Fix bar reference to master.variantId

804f2ff

removed redundant aria label that repeating email confirmation title

91bae5a

removed redundant aria label that repeating email confirmation title

be7626f

mitigating the need for additional translations

f3b718e

feat: cursor rules for unit tests

9969319

Merge pull request #2577 from SalesforceCommerceCloud/sz-W-18677509-c…

ccf10b3

…ursor-unit-test-rules-v3 @W-18677509 feat: Create Initial set of cursor rules

Merge branch 'develop' into bendvc/W-18647820_fix-einstein-add-to-cart

0e5fc4b

Update packages/template-retail-react-app/CHANGELOG.md

492fe5c

Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com>

Update packages/template-retail-react-app/CHANGELOG.md

72279c2

Co-authored-by: Yuna Kim <84923642+yunakim714@users.noreply.github.com> Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com>

Update change log

1860c67

Merge branch 'develop' into W-17599234-A11Y-email-modal-8

89ef272

Merge pull request #2558 from SalesforceCommerceCloud/bendvc/W-186478…

f61bfc9

…20_fix-einstein-add-to-cart [Einstein] Fix `addToCart` payload @@W-18647820@@

Merge branch 'develop' into W-17599234-A11Y-email-modal-8

59f5209

Signed-off-by: Larnelle Ankunda <lankunda@salesforce.com>

Fixing bad merge

fc14355

Update sample query implementation in query.ts

65e519b

Merge branch 'develop' into feature/handle-missing-sdk-clients

a8b3a66

Merge pull request #2539 from SalesforceCommerceCloud/feature/handle-…

95672ae

…missing-sdk-clients @W-18568190@ - Handle missing SDK Clients in CommerceApiProviders

Merge branch 'develop' into W-17599234-A11Y-email-modal-8

33edb86

Merge pull request #2540 from SalesforceCommerceCloud/W-17599234-A11Y…

49c949f

…-email-modal-8 @W-17599234 - Ensure voiceover announces contents of the email confirmation modal

[Fix E2E Tests] Improve E2E Test and Tracking Consent Banner Handling…

d45078a

… (@W-18764173@) (#2575) * Improve e2e tests and Tracking Consent banner handling * Clean up * More clean up * Remove spacing changes * PR Feedback * Remove comments

rules only

9abec74

Update translations (#2616)

5083670

* update translations

Merge branch 'develop' into sz-W-18800010-rules-only

4956da9

Merge pull request #2597 from SalesforceCommerceCloud/sz-W-18800010-r…

206e6d2

…ules-only @W-18800010 Improve unit test rules

sf-emmyzhang requested a review from a team as a code owner June 23, 2025 21:23

sf-emmyzhang merged commit b5e7dc8 into standard-product-support Jun 23, 2025
34 of 35 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge develop into standard product feature branch #2626

merge develop into standard product feature branch #2626
sf-emmyzhang merged 75 commits intostandard-product-supportfrom
develop

sf-emmyzhang commented Jun 23, 2025 •

edited

Loading

Uh oh!

cc-prodsec commented Jun 23, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Conversation

sf-emmyzhang commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of Changes

Changes

How to Test-Drive This PR

Checklists

General

Accessibility Compliance

Localization

Uh oh!

cc-prodsec commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎉 Snyk checks have passed. No issues have been found so far.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

sf-emmyzhang commented Jun 23, 2025 •

edited

Loading

cc-prodsec commented Jun 23, 2025 •

edited

Loading