Update feature branch with latest changes in develop#3173
Merged
sf-shikhar-prasoon merged 1 commit intofeature/manual-bonus-products-v3-port-from-v4from Aug 25, 2025
Merged
Update feature branch with latest changes in develop#3173sf-shikhar-prasoon merged 1 commit intofeature/manual-bonus-products-v3-port-from-v4from
develop#3173sf-shikhar-prasoon merged 1 commit intofeature/manual-bonus-products-v3-port-from-v4from
Conversation
… version) (#2892) * Initial restore of base path PR * Rename path functions * Update commerce-sdk-react callbacks and slas private proxy endpoint * Big update * Replace getAppOrigin calls with useAppOrigin * WIP - Filter the base path from all incoming requests to the server * Remove base path from proxied requests + cleanup * Use functions for proxy pathRewrite * A bit of PR cleanup * Lint cleanup * More cleanup * Fix tests * Fix issues found by CI * Lint for override asset * Turn off slas private proxy * Cleanup comments * Update changelog entries * Fix config * Limit base path removal to /mobify or express route * Adjust express filter * Lint * Fix dependency in generated apps * Comment cleanup * use envBasePath as a feature toggle for enabling the base path middleware * Enable basepath removal middlware to handle express routes defined as regexes * Apply suggestions * Adjust app config template * Use pathToRegexp rather than having manual regex interpretation * escape the base path to not allow regex * refactor * Remove ?* from callback url * Handle ? characters in express route * Cache express regexes * Handle properly formatted ()? express groups * Comment cleanup * Apply suggestions to reduce use of regex * Add base path to social login redirectUri * Lint * Update comments and test * Update test with more realistic scenario * Remove path-to-regexp * Refine convertExpressRouteToRegex further * Move express route to regex logic to separate file * Adjust logger and lock file * Revert package-lock changes --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com>
Collaborator
🎉 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) |
a3625f0
into
feature/manual-bonus-products-v3-port-from-v4
229 of 258 checks passed
sf-shikhar-prasoon
added a commit
that referenced
this pull request
Sep 22, 2025
* Manual bonus products port from v4 * @W-19265242@ Configurable base paths for /mobify routes (PWA Kit 3.12 version) (#2892) (#3173) * Initial restore of base path PR * Rename path functions * Update commerce-sdk-react callbacks and slas private proxy endpoint * Big update * Replace getAppOrigin calls with useAppOrigin * WIP - Filter the base path from all incoming requests to the server * Remove base path from proxied requests + cleanup * Use functions for proxy pathRewrite * A bit of PR cleanup * Lint cleanup * More cleanup * Fix tests * Fix issues found by CI * Lint for override asset * Turn off slas private proxy * Cleanup comments * Update changelog entries * Fix config * Limit base path removal to /mobify or express route * Adjust express filter * Lint * Fix dependency in generated apps * Comment cleanup * use envBasePath as a feature toggle for enabling the base path middleware * Enable basepath removal middlware to handle express routes defined as regexes * Apply suggestions * Adjust app config template * Use pathToRegexp rather than having manual regex interpretation * escape the base path to not allow regex * refactor * Remove ?* from callback url * Handle ? characters in express route * Cache express regexes * Handle properly formatted ()? express groups * Comment cleanup * Apply suggestions to reduce use of regex * Add base path to social login redirectUri * Lint * Update comments and test * Update test with more realistic scenario * Remove path-to-regexp * Refine convertExpressRouteToRegex further * Move express route to regex logic to separate file * Adjust logger and lock file * Revert package-lock changes --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * fix quality issue * remove accidental bug.patch file * address review comments and add tests * lint fixes * @W-19398239 Bonus Product Selection grid changes (#3255) * remove counter on modal. add tests * update 3 modals' appearnance to match * add wishlist toggle icon, add NEW/SALE tag * add more tests * Return to the bonus selection modal if there are more available bonus products * Added tests, fixed linting errors * fix error page and add toast message * More fixes for linting errors * labels * revert last commit * add default message in js code and en-XA * test * Fixed the cart page rendering bonus products outside of the qualifying product tile * Hide the select bonus procuct tile when the qualifying product does not have bonus products * fix modal position, add header title, back to seletion on close * translation * fix intial load error * keep close button unchanged and add a new back to selection button, and tests * add scroll and tests (#3273) * @W-19398462 Fix Cart Page appearance (#3279) * add scroll and tests * cart page appearance * fix quality issue and reuse exsting cancel label * @ W-19398462 Bug- combine line items (#3282) * merge lineItems, add qtys * add tests * refactor tests. use template * @W-19605924 Fit and Finish Bonus Products Pt.1 : Change "Back to Selection" button acc. to feedback from UX (#3291) * change backToSele btn acc to UX feedback * fix todos. fix lint * fix mobile view * fix button groups blocks content( add to cart / cancel) * fix buttons should not need scrolling * fix pdp modal mobile view --------- Co-authored-by: sf-xingquan-jin <xingquan.jin@salesforce.com> * fix via bonusDiscountLineItemId, add+update tests * bug fix- bulk remove bonus items + tests + fade & disable (#3305) * update changelog (#3308) * @W-19627517 Fit & Finish `feature/manual-bonus-products-v3` branch (#3309) * changes from npm run lint:fix * fix all tests * fix bug. qty selector on pdp * sentencecase modal heading: on doc suggestion * left align name & price on BonusProductItem * add back, wishlist and NEW/SALE tag: BonusProductItem component * fix tests * fix lint * remove background blur & fix findAvailableBonusDiscountLineItemIds * remove horizontal rule for last bonus product:cart page * @W-19649287 Fix Bundle Size Limit, Fix (unrelated) TFs (#3314) * increase bundle size limit * fix TFs due to changes from develop * @W-19649287 refactor and improve code quality (`feature/manual-bonus-products-v3` branch) (#3315) * refactored bonus-product-utils.js * implement modal reducer. use-bonus-product-selection-modal.js was too large (675 lines) * update bundle size limit * group bonus-product utils in a folder * restructure util files. all small size. theme for every file * T/cc sharks/w 19670468/mobile view back to selection/main (#3323) * move back btn, only for mobile * add tests * Enable add to wishlist for bonus products on the cart page. * @W-19679519 bug fix: Wrong variant image in bonus product selection modal (#3326) * fix image shown in selection modal, add tests * update bundle size limit * address comments from #3292 (#3332) * ignore tests failing due to import resolution issues in test environment * fix lint and tests --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: cboscenco <cboscenco@salesforce.com> Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: sf-xingquan-jin <xingquan.jin@salesforce.com> Co-authored-by: emmyzhang <emmyzhang@salesforce.com>
shethj
pushed a commit
that referenced
this pull request
Sep 22, 2025
* Manual bonus products port from v4 * @W-19265242@ Configurable base paths for /mobify routes (PWA Kit 3.12 version) (#2892) (#3173) * Initial restore of base path PR * Rename path functions * Update commerce-sdk-react callbacks and slas private proxy endpoint * Big update * Replace getAppOrigin calls with useAppOrigin * WIP - Filter the base path from all incoming requests to the server * Remove base path from proxied requests + cleanup * Use functions for proxy pathRewrite * A bit of PR cleanup * Lint cleanup * More cleanup * Fix tests * Fix issues found by CI * Lint for override asset * Turn off slas private proxy * Cleanup comments * Update changelog entries * Fix config * Limit base path removal to /mobify or express route * Adjust express filter * Lint * Fix dependency in generated apps * Comment cleanup * use envBasePath as a feature toggle for enabling the base path middleware * Enable basepath removal middlware to handle express routes defined as regexes * Apply suggestions * Adjust app config template * Use pathToRegexp rather than having manual regex interpretation * escape the base path to not allow regex * refactor * Remove ?* from callback url * Handle ? characters in express route * Cache express regexes * Handle properly formatted ()? express groups * Comment cleanup * Apply suggestions to reduce use of regex * Add base path to social login redirectUri * Lint * Update comments and test * Update test with more realistic scenario * Remove path-to-regexp * Refine convertExpressRouteToRegex further * Move express route to regex logic to separate file * Adjust logger and lock file * Revert package-lock changes --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> * fix quality issue * remove accidental bug.patch file * address review comments and add tests * lint fixes * @W-19398239 Bonus Product Selection grid changes (#3255) * remove counter on modal. add tests * update 3 modals' appearnance to match * add wishlist toggle icon, add NEW/SALE tag * add more tests * Return to the bonus selection modal if there are more available bonus products * Added tests, fixed linting errors * fix error page and add toast message * More fixes for linting errors * labels * revert last commit * add default message in js code and en-XA * test * Fixed the cart page rendering bonus products outside of the qualifying product tile * Hide the select bonus procuct tile when the qualifying product does not have bonus products * fix modal position, add header title, back to seletion on close * translation * fix intial load error * keep close button unchanged and add a new back to selection button, and tests * add scroll and tests (#3273) * @W-19398462 Fix Cart Page appearance (#3279) * add scroll and tests * cart page appearance * fix quality issue and reuse exsting cancel label * @ W-19398462 Bug- combine line items (#3282) * merge lineItems, add qtys * add tests * refactor tests. use template * @W-19605924 Fit and Finish Bonus Products Pt.1 : Change "Back to Selection" button acc. to feedback from UX (#3291) * change backToSele btn acc to UX feedback * fix todos. fix lint * fix mobile view * fix button groups blocks content( add to cart / cancel) * fix buttons should not need scrolling * fix pdp modal mobile view --------- Co-authored-by: sf-xingquan-jin <xingquan.jin@salesforce.com> * fix via bonusDiscountLineItemId, add+update tests * bug fix- bulk remove bonus items + tests + fade & disable (#3305) * update changelog (#3308) * @W-19627517 Fit & Finish `feature/manual-bonus-products-v3` branch (#3309) * changes from npm run lint:fix * fix all tests * fix bug. qty selector on pdp * sentencecase modal heading: on doc suggestion * left align name & price on BonusProductItem * add back, wishlist and NEW/SALE tag: BonusProductItem component * fix tests * fix lint * remove background blur & fix findAvailableBonusDiscountLineItemIds * remove horizontal rule for last bonus product:cart page * @W-19649287 Fix Bundle Size Limit, Fix (unrelated) TFs (#3314) * increase bundle size limit * fix TFs due to changes from develop * @W-19649287 refactor and improve code quality (`feature/manual-bonus-products-v3` branch) (#3315) * refactored bonus-product-utils.js * implement modal reducer. use-bonus-product-selection-modal.js was too large (675 lines) * update bundle size limit * group bonus-product utils in a folder * restructure util files. all small size. theme for every file * T/cc sharks/w 19670468/mobile view back to selection/main (#3323) * move back btn, only for mobile * add tests * Enable add to wishlist for bonus products on the cart page. * @W-19679519 bug fix: Wrong variant image in bonus product selection modal (#3326) * fix image shown in selection modal, add tests * update bundle size limit * address comments from #3292 (#3332) * ignore tests failing due to import resolution issues in test environment * fix lint and tests --------- Signed-off-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: cboscenco <cboscenco@salesforce.com> Co-authored-by: vcua-mobify <47404250+vcua-mobify@users.noreply.github.com> Co-authored-by: sf-xingquan-jin <xingquan.jin@salesforce.com> Co-authored-by: emmyzhang <emmyzhang@salesforce.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
… version) (#2892)
Initial restore of base path PR
Rename path functions
Update commerce-sdk-react callbacks and slas private proxy endpoint
Big update
Replace getAppOrigin calls with useAppOrigin
WIP - Filter the base path from all incoming requests to the server
Remove base path from proxied requests + cleanup
Use functions for proxy pathRewrite
A bit of PR cleanup
Lint cleanup
More cleanup
Fix tests
Fix issues found by CI
Lint for override asset
Turn off slas private proxy
Cleanup comments
Update changelog entries
Fix config
Limit base path removal to /mobify or express route
Adjust express filter
Lint
Fix dependency in generated apps
Comment cleanup
use envBasePath as a feature toggle for enabling the base path middleware
Enable basepath removal middlware to handle express routes defined as regexes
Apply suggestions
Adjust app config template
Use pathToRegexp rather than having manual regex interpretation
escape the base path to not allow regex
refactor
Remove ?* from callback url
Handle ? characters in express route
Cache express regexes
Handle properly formatted ()? express groups
Comment cleanup
Apply suggestions to reduce use of regex
Add base path to social login redirectUri
Lint
Update comments and test
Update test with more realistic scenario
Remove path-to-regexp
Refine convertExpressRouteToRegex further
Move express route to regex logic to separate file
Adjust logger and lock file
Revert package-lock changes
Description
Types of Changes
Changes
How to Test-Drive This PR
Checklists
General
Accessibility Compliance
You must check off all items in one of the follow two lists:
or...
Localization