@ W-18953852: Merge Feature/auto bonus product in to Develop by ddiazccrz · Pull Request #2704 · SalesforceCommerceCloud/pwa-kit

ddiazccrz · 2025-07-01T22:29:20Z

Description

Merge the Feature/Auto-Bonus-Product branch that contains support for automatic bonus products in to the develop branch

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

On the refArch store, women's dresses have an automatic promotion where adding 250 worth of dresses will trigger an automatic bonus product to show up in the cart

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)

…products

…407137V2 @W-18407137 Trigger a modal if new bonus products exist in AddToCart response

…roducts-merge Merged Develop in to Feature/Bonus-Product

packages/template-retail-react-app/app/mocks/mock-data.js

alexvuong · 2025-07-03T19:18:22Z

packages/template-retail-react-app/app/pages/cart/index.jsx

    }
+
+    // Categorize products into regular and bonus
+    const categorizedProducts = basket.productItems?.reduce(


Do you think it is worth to extract this logic to a util function? I think we want to do this for PDP as well when adding an item to cart?

Let's use useMemo to make sure this does not run again unless basket has changed

I dont think we need this on PDP yet, when/if we do we can extract. Updated to useMemo though

alexvuong · 2025-07-03T19:37:11Z

packages/template-retail-react-app/app/pages/cart/index.test.js

-            ).toBeVisible()
-        })
+        const regularProduct = screen.getByTestId('sf-cart-item-701642889830M')
+        const bonusProduct = screen.getByTestId('sf-cart-item-013742335262M')


Why don't we look for product name being render on the UI? From react-testing-library best practise, it is better to test using getByText/getByLabelText instead of relying on getByTestId

alexvuong · 2025-07-03T19:37:47Z

packages/template-retail-react-app/app/pages/cart/index.test.js

-        ])
+describe('Bonus products', () => {
+    beforeEach(() => {
+        global.server.use(


How about using prependHandlersToServer to reduce the boilerplate code for api mock?

alexvuong · 2025-07-03T19:39:02Z

packages/template-retail-react-app/app/pages/cart/index.test.js

+
+describe('Unavailable products tests', () => {
+    beforeEach(() => {
+        global.server.use(


Why is this test changed?

not sure, undid this

alexvuong · 2025-07-03T20:17:11Z

packages/template-retail-react-app/app/pages/cart/index.test.js

        })
+
+        const regularProduct = screen.getByTestId('sf-cart-item-013742335262M')
+        expect(regularProduct).toBeInTheDocument()


Why is this test changed?

dont know, undid this change

Co-authored-by: Alex Vuong <alex.vuong@salesforce.com> Signed-off-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com>

alexvuong · 2025-07-03T20:19:28Z

packages/template-retail-react-app/app/pages/cart/partials/bonus-products-title.test.js

+                {id: '2', bonusProductLineItem: false}
+            ]
+        }
+        render(<MockedComponent basketData={basketData} />)


Can we use renderWithProviders from test-utils.js?

… feature/auto-bonus-product

ddiazccrz · 2025-07-04T00:10:01Z

I can't remove bonus item from cart despite it said item is removed from cart from a toast.

auto.bonus.cart.mov

I removed the remove button, for auto-bonus products you cant actually remove them as the server just keeps adding them back in on cart calculation. We dont have anything but auto-bonus products right now so not a need to change this yet.

Signed-off-by: sf-deepali-bharmal <deepali.bharmal@salesforce.com>

* Trigger a modal if bonus products exist in AddToCart response * skip changelog * skip changelog * fixed import issue * Added bonus products on the cart page * Updated change log * Removed unused import * Updated cart secondary buttons remove is gift and wishlist for bonus products * Add bonus products title partial test * Fixed linting issues * Review suggestions * removed localstorage and updated bonus products info from current basket * removed unnecessary code * nit space * Code review comments * fixed 2 failing tests * Fix linting issues * fixed a unit test * fixed lint errors * Moved mock data, removed un-needed index * Addressed PR comments * use current basket query * nit * removed unnecessary code * Switched to test from it * fixed infinite re-render issue * Merged Develop in to Feature * fixed lint issue when merging * Update CHANGELOG.md Signed-off-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com> * Removed label check since no longer present * Removed partials and made them components * Updated translations * Update translation and missing label * Reverted bonus product modal * Removed bonus product from test util * Fixed whitespace issues * Fixed change log * Fixed more whitespace * Added in the PR: 2562 * Refactored onblur and onChange to be functions * Update packages/template-retail-react-app/app/pages/cart/partials/bonus-products-title.jsx Co-authored-by: Ken Zheng <33469941+kzheng-sfdc@users.noreply.github.com> Signed-off-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com> * Update packages/template-retail-react-app/app/mocks/mock-data.js Co-authored-by: Alex Vuong <alex.vuong@salesforce.com> Signed-off-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com> * Fixed unit test * Fixed lint --------- Signed-off-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com> Signed-off-by: sf-deepali-bharmal <deepali.bharmal@salesforce.com> Co-authored-by: madhuri-uppu <madhuri.uppu@salesforce.com> Co-authored-by: Ken Zheng <33469941+kzheng-sfdc@users.noreply.github.com> Co-authored-by: Alex Vuong <alex.vuong@salesforce.com> Co-authored-by: sf-deepali-bharmal <deepali.bharmal@salesforce.com>

sf-madhuri-uppu and others added 30 commits June 9, 2025 14:49

Trigger a modal if bonus products exist in AddToCart response

802b9d3

skip changelog

790a72b

skip changelog

c2021fa

fixed import issue

0aadd8b

Added bonus products on the cart page

69d49b2

Updated change log

bfb54b2

Removed unused import

a47d9b0

Updated cart secondary buttons remove is gift and wishlist for bonus …

c693bea

…products

Add bonus products title partial test

92ec48e

Fixed linting issues

84775e5

Review suggestions

7830475

removed localstorage and updated bonus products info from current basket

83b1dbb

removed unnecessary code

0a697ef

nit space

4a0950c

Code review comments

5c7b0bb

fixed 2 failing tests

afb7dc9

Fix linting issues

2600c99

fixed a unit test

bd8f645

fixed lint errors

392c52f

Moved mock data, removed un-needed index

90226ae

Addressed PR comments

9414838

use current basket query

f8fd65e

nit

e441ee9

removed unnecessary code

4848f14

Switched to test from it

3e7d1f9

fixed infinite re-render issue

9f6cfe5

Merge pull request #2541 from SalesforceCommerceCloud/t/cc-shark/W-18…

06f0de5

…407137V2 @W-18407137 Trigger a modal if new bonus products exist in AddToCart response

Merged Develop in to Feature

4f8a0f5

fixed lint issue when merging

fb4c351

Merge pull request #2560 from SalesforceCommerceCloud/feature/bonus-p…

bc28fc3

…roducts-merge Merged Develop in to Feature/Bonus-Product

alexvuong reviewed Jul 3, 2025

View reviewed changes

packages/template-retail-react-app/app/mocks/mock-data.js Outdated Show resolved Hide resolved

alexvuong reviewed Jul 3, 2025

View reviewed changes

Update packages/template-retail-react-app/app/mocks/mock-data.js

09b5ccf

Co-authored-by: Alex Vuong <alex.vuong@salesforce.com> Signed-off-by: Daniel Diaz <38542490+ddiazccrz@users.noreply.github.com>

alexvuong reviewed Jul 3, 2025

View reviewed changes

ddiazccrz added 3 commits July 3, 2025 19:16

Code Review Changes

755f63f

Fixed unit test

adb5603

Merge remote-tracking branch 'origin/feature/auto-bonus-product' into…

c6e15a9

… feature/auto-bonus-product

Fixed lint

facc6d0

kzheng-sfdc previously approved these changes Jul 4, 2025

View reviewed changes

sf-deepali-bharmal previously approved these changes Jul 7, 2025

View reviewed changes

Merge branch 'develop' into feature/auto-bonus-product

5f37a75

Signed-off-by: sf-deepali-bharmal <deepali.bharmal@salesforce.com>

sf-deepali-bharmal dismissed stale reviews from kzheng-sfdc and themself via 5f37a75 July 7, 2025 16:13

Merge branch 'develop' into feature/auto-bonus-product

3c2b693

kzheng-sfdc approved these changes Jul 7, 2025

View reviewed changes

sf-kyle-wright approved these changes Jul 7, 2025

View reviewed changes

sf-vrushal-kulkarni approved these changes Jul 7, 2025

View reviewed changes

sf-emmyzhang approved these changes Jul 7, 2025

View reviewed changes

sf-deepali-bharmal approved these changes Jul 7, 2025

View reviewed changes

sf-jhalak-maheshwari approved these changes Jul 7, 2025

View reviewed changes

bfeister approved these changes Jul 7, 2025

View reviewed changes

ddiazccrz enabled auto-merge (squash) July 8, 2025 14:27

Merge branch 'develop' into feature/auto-bonus-product

99e8c91

ddiazccrz merged commit cf94a6a into develop Jul 8, 2025
36 checks passed

Conversation

ddiazccrz commented Jul 1, 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!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexvuong Jul 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ddiazccrz commented Jul 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

ddiazccrz commented Jul 1, 2025 •

edited

Loading

alexvuong Jul 3, 2025 •

edited

Loading