Skip to content

@W-19323372 - Update Order Plugin Feature Branch with latest Develop Changes #3087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

@W-19323372 - Update Order Plugin Feature Branch with latest Develop Changes #3087

wants to merge 19 commits into from

Conversation

sf-deepali-bharmal
Copy link
Contributor

Description

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...

Localization

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

sf-deepali-bharmal and others added 18 commits July 15, 2025 10:23
@sf-deepali-bharmal
Initial empty commit for order-management-plugin
405d93f
@sf-deepali-bharmal
W 18998603 Route 'Order Status' 'footer link to a new Order Status Pa…
5c5a5e7 
…ge (#2795)

* Initial empty commit for order-management-plugin

* Order Status footer link routes to a new Order Status Page
@sf-emmyzhang @sf-deepali-bharmal
[OMS] Add cancel button and modal @W-18998059 (#2775)
d789bcf 
* add button and modal

* Initial empty commit for order-management-plugin

* separate modal component; changelog

* unit tests

* labels

* remove redundancy

* chakra?

* update changelog

* mark cancellation props as required

---------

Signed-off-by: sf-emmyzhang <[email protected]>
Co-authored-by: sf-deepali-bharmal <[email protected]>
@sf-emmyzhang
Merge branch 'pwa-kit-staging' into feature/order-management-plugin
34bee60 
Signed-off-by: sf-emmyzhang <[email protected]>
@sf-deepali-bharmal
Add a Login Form in Order Status Page (#2827)
8cdc9b9 
simplify the parameter passing

Update based on new UX

revert unwanted changes

styling change
@sf-madhuri-uppu
Cancelled status pill (#2884)
91aa36d
@sf-madhuri-uppu @sf-deepali-bharmal @sf-emmyzhang
@W-18998088 Order tracker on order details page (#2790)
1e3b6a2 
* Initial empty commit for order-management-plugin

* skip changelog

* add white border to svg

* skip changelog

* order tracker

* Fixed lint errors

* Addressed PR comments

* Removed unnecessary comments

* Refactored the code

* Made the tracker accessible

* PR comments

* Added compiled files

---------

Co-authored-by: sf-deepali-bharmal <[email protected]>
Co-authored-by: emmyzhang <[email protected]>
@sf-deepali-bharmal
Add Order Retrieval form (#2858)
1619427
@sf-deepali-bharmal @patricksullivansf
@vcua-mobify @ddiazccrz @carson-campbell @vmarta @seckardt @joeluong-sfcc
Update Order Plugin feature branch with Develop latest (#2873)
da75f71 
* @W-19054407 BOPIS fix bundle inventory and child pickup selection (#2823)

* @W-19054407 BOPIS fix bundle inventory and child pickup selection

* @W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog

* Revert "@W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog"

This reverts commit f5be70b.

* @W-19054407 BOPIS changelog update

---------

Co-authored-by: vcua-mobify <[email protected]>

* @W-19053749: Updated changelog to match new accepted style (#2837)

* Updated changelog

* @W-19045349 Add better error handling for Datacloud (#2811)

* Add better error handling for Datacloud

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <[email protected]>

* Add new dataCloudAPI config

Signed-off-by: Carson Campbell <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <[email protected]>

* Refactored to decrease duplicate code

Signed-off-by: Carson Campbell <[email protected]>

* Fix prettier issues

Signed-off-by: Carson Campbell <[email protected]>

* Remove comments

Signed-off-by: Carson Campbell <[email protected]>

* Sync datacloud api values (#2843)

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

---------

Signed-off-by: Carson Campbell <[email protected]>
Co-authored-by: Vincent Marta <[email protected]>

* feat: add feature flag to enable/disable partial hydration @W-19082948 (#2846)

* update commerce-sdk-react

* update changelog

---------

Signed-off-by: Carson Campbell <[email protected]>
Co-authored-by: patricksullivansf <[email protected]>
Co-authored-by: vcua-mobify <[email protected]>
Co-authored-by: Daniel Diaz <[email protected]>
Co-authored-by: Carson Campbell <[email protected]>
Co-authored-by: Vincent Marta <[email protected]>
Co-authored-by: Steffen Eckardt <[email protected]>
Co-authored-by: Joel Uong <[email protected]>
@sf-deepali-bharmal
Add Translation support for PWA Kit (#2895)
1da7c62
@sf-deepali-bharmal @snilakandan13
@yhsieh1 @vcua-mobify @bendvc @patricksullivansf @ddiazccrz @carson-campbell @vmarta @seckardt @joeluong-sfcc @sf-henry-semaganda @shethj @alexvuong
Update OMS feature branch with develop (#2919)
6978641 
* Added cursor rules

* Rules updated

* Rules updated

* Updated Readme document

* Updated rules

* updated rules

* Cursor Rules for generating components

* Added MCP rules for Component creation

* @W-18737391 Add developemnt guidelines and page creation rules

* remove from .cursor/rules folder

* update rule

* condense guideliens

* update changelog

* update rule to help pattern match

* Cursor rules and cleanup of tool

* Deleting from the monorepo

* skip changelog

* Update CHANGELOG.md

* bump versions

* Bump versions in mcp server

* added cursor rules

* Added options for other

* move cursor rules to root

* move cursor rules to root

* revert change log

* Cursor rules for creating new component

* nested cursor rules

* move to nested rules location

* revert create mobify app js

* Initial Commit

Add initGit option
Update readme for create app tool
Always use latest for create app npx package version.

* Change when git init is run

also added basic gitignore for non-extension projects

* Update CHANGELOG.md

* Fix tests

* Rename pwa-kit-mcp project

* Update server.js

* Include bin entry in package.json

* update changelog.md

* update changelog.md

* Fix dependencies etc

* Add example with output dir

* remove duplicated rules under assets

* @W-19065116 fix formating issue

* Punctuation fix in readme

* @W-19054407 BOPIS fix bundle inventory and child pickup selection (#2823)

* @W-19054407 BOPIS fix bundle inventory and child pickup selection

* @W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog

* Revert "@W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog"

This reverts commit f5be70b.

* @W-19054407 BOPIS changelog update

---------

Co-authored-by: vcua-mobify <[email protected]>

* Update program.json

PR feedback on description.

Signed-off-by: Ben Chypak <[email protected]>

* @W-19053749: Updated changelog to match new accepted style (#2837)

* Updated changelog

* update changelog

* revert development guidelines changes

* revert development guidelines changes

* Rename package to pwa-kit-mcp

* Update server json in readme

* Update readme and bump version

* Ensure the latest version is used in readme example

* Version align the mcp server with the platform version

* Use --initGit flag and test for .git/ creation

* Add flag both commands for template and presets

* Ensure gitignore is created

* Ensure default command includes --initGit

* Update base command

* @W-19045349 Add better error handling for Datacloud (#2811)

* Add better error handling for Datacloud

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <[email protected]>

* Add new dataCloudAPI config

Signed-off-by: Carson Campbell <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <[email protected]>

* Refactored to decrease duplicate code

Signed-off-by: Carson Campbell <[email protected]>

* Fix prettier issues

Signed-off-by: Carson Campbell <[email protected]>

* Remove comments

Signed-off-by: Carson Campbell <[email protected]>

* Sync datacloud api values (#2843)

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

---------

Signed-off-by: Carson Campbell <[email protected]>
Co-authored-by: Vincent Marta <[email protected]>

* encapulate rule copy logic

* update e2e test to verify .cursor folder is generated

* feat: add feature flag to enable/disable partial hydration @W-19082948 (#2846)

* update changelog

* Bump versions

* Clean up changelogs

* Better prompting for cursor and create app program

* update commerce-sdk-react

* update changelog

* bump version

* bump develop to next dev version

* Update changelogs

* Change version number

* Update readme

* Move tools to tools folder

* Clean up files/folders, create new tool folder.

* Lint

* A11y tests - Handle dynamic aria labels generated by chakra UI (#2864)

* Handle dynamic aria labels generated by chakra UI

* improve sanitization

---------

Co-authored-by: Alex Vuong <[email protected]>

---------

Signed-off-by: yhsieh1 <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>
Signed-off-by: Carson Campbell <[email protected]>
Co-authored-by: snilakandan <[email protected]>
Co-authored-by: Yuming Hsieh <[email protected]>
Co-authored-by: vcua-mobify <[email protected]>
Co-authored-by: snilakandan13 <[email protected]>
Co-authored-by: Ben Chypak <[email protected]>
Co-authored-by: patricksullivansf <[email protected]>
Co-authored-by: vcua-mobify <[email protected]>
Co-authored-by: Ben Chypak <[email protected]>
Co-authored-by: Daniel Diaz <[email protected]>
Co-authored-by: Carson Campbell <[email protected]>
Co-authored-by: Vincent Marta <[email protected]>
Co-authored-by: Steffen Eckardt <[email protected]>
Co-authored-by: Joel Uong <[email protected]>
Co-authored-by: sf-henry-semaganda <[email protected]>
Co-authored-by: Jainam Sheth <[email protected]>
Co-authored-by: Alex Vuong <[email protected]>
@sf-deepali-bharmal
Add OrderStatus in Mobile Menu (#2902)
a833a55
@sf-madhuri-uppu
@W-19149281 Cancelled status pill color on order details page (#2955)
8bd87a8 
* skip changelog

* skip changelog

* Updated translations
@sf-emmyzhang
@W-18998712 Cancel order modal #2841 (#2841)
f5fd3c3
@sf-emmyzhang @snilakandan13
@yhsieh1 @vcua-mobify @bendvc @patricksullivansf @ddiazccrz @carson-campbell @vmarta @szirpesf @seckardt @shethj @joeluong-sfcc @sf-henry-semaganda @alexvuong @wei-liu-sf @aditek-sf @unandyala @avinashkasipathy @knhage @bfeister
Merge develop into oms feature branch (#3009)
61ee444 
* Added cursor rules

* Rules updated

* Rules updated

* Updated Readme document

* Updated rules

* updated rules

* Cursor Rules for generating components

* Added MCP rules for Component creation

* @W-18737391 Add developemnt guidelines and page creation rules

* remove from .cursor/rules folder

* update rule

* condense guideliens

* update changelog

* update rule to help pattern match

* Cursor rules and cleanup of tool

* Deleting from the monorepo

* skip changelog

* Update CHANGELOG.md

* bump versions

* Bump versions in mcp server

* added cursor rules

* Added options for other

* move cursor rules to root

* move cursor rules to root

* revert change log

* Cursor rules for creating new component

* nested cursor rules

* move to nested rules location

* revert create mobify app js

* Initial Commit

Add initGit option
Update readme for create app tool
Always use latest for create app npx package version.

* Change when git init is run

also added basic gitignore for non-extension projects

* Update CHANGELOG.md

* Fix tests

* Rename pwa-kit-mcp project

* Update server.js

* Include bin entry in package.json

* update changelog.md

* update changelog.md

* Fix dependencies etc

* Add example with output dir

* remove duplicated rules under assets

* @W-19065116 fix formating issue

* Punctuation fix in readme

* @W-19054407 BOPIS fix bundle inventory and child pickup selection (#2823)

* @W-19054407 BOPIS fix bundle inventory and child pickup selection

* @W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog

* Revert "@W-19054407 BOPIS fix bundle inventory and child pickup selection changlelog"

This reverts commit f5be70b.

* @W-19054407 BOPIS changelog update

---------

Co-authored-by: vcua-mobify <[email protected]>

* Update program.json

PR feedback on description.

Signed-off-by: Ben Chypak <[email protected]>

* @W-19053749: Updated changelog to match new accepted style (#2837)

* Updated changelog

* update changelog

* revert development guidelines changes

* revert development guidelines changes

* Rename package to pwa-kit-mcp

* Update server json in readme

* Update readme and bump version

* Ensure the latest version is used in readme example

* Version align the mcp server with the platform version

* Use --initGit flag and test for .git/ creation

* Add flag both commands for template and presets

* Ensure gitignore is created

* Ensure default command includes --initGit

* Update base command

* @W-19045349 Add better error handling for Datacloud (#2811)

* Add better error handling for Datacloud

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <[email protected]>

* Add new dataCloudAPI config

Signed-off-by: Carson Campbell <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update use-datacloud.test.js

Signed-off-by: Carson Campbell <[email protected]>

* Update datacloud-mock-data.js

Signed-off-by: Carson Campbell <[email protected]>

* Refactored to decrease duplicate code

Signed-off-by: Carson Campbell <[email protected]>

* Fix prettier issues

Signed-off-by: Carson Campbell <[email protected]>

* Remove comments

Signed-off-by: Carson Campbell <[email protected]>

* Sync datacloud api values (#2843)

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Carson Campbell <[email protected]>

---------

Signed-off-by: Carson Campbell <[email protected]>
Co-authored-by: Vincent Marta <[email protected]>

* qa prompt

* update

* encapulate rule copy logic

* update e2e test to verify .cursor folder is generated

* feat: add feature flag to enable/disable partial hydration @W-19082948 (#2846)

* update changelog

* Bump versions

* Clean up changelogs

* Update usid expiry to match refresh_token expiry

* Linting fix

* Update changelog

* Better prompting for cursor and create app program

* Update packages/commerce-sdk-react/src/auth/index.ts

Co-authored-by: vcua-mobify <[email protected]>
Signed-off-by: Jainam Sheth <[email protected]>

* Add unit tests for usid expiry

* Remove overlapping test cases

* update commerce-sdk-react

* update changelog

* bump version

* bump develop to next dev version

* Update changelogs

* Change version number

* Update readme

* Move tools to tools folder

* Clean up files/folders, create new tool folder.

* Lint

* A11y tests - Handle dynamic aria labels generated by chakra UI (#2864)

* Handle dynamic aria labels generated by chakra UI

* improve sanitization

---------

Co-authored-by: Alex Vuong <[email protected]>

* initial implementation of create page mcp tool

* fix

* support open url

* fix the import

* update README and changelog

* Modified create page mcp tool

* Added Image Componentsupport to Create page MCP tool

* Fixed failing tests

* Added new and fixed failing tests and corrected linting issues

* Added new test and minor update to system prompt

* Updated image component functionality

* Updated system prompt

* Fixed routes issue

* Added tests and comments

* Fixed merge conflicts and moved cursor to retail-react-app

* skip changelog

* Removed unused const

* Addressed comments

* Update reading expiry time for usid

* Removed the cursor rule

* Update codeowners file to include ownership for specific features (#2921)

* Update codeowners

* @W-18895609: 🚀 Shopper Agent Experience v3.0 (#2658)

* feat: shopper agent experience v3.0

* fix: enabling streaming (#2911)

* Committing for Rules and cleanup

* skip changelog

* Fixed tests

* Remove reference to claude and clean up readme

* Update CHANGELOG.md

* Lint fix

* Addressed comments

* Make development section more robust.

* Removed the flex hardcode in log message

* Fixing Page Tool

* Fixing Linter

* Updating the Page tool

* Fix eslint discoverability in the monorepo (@W-19068681@) (#2927)

* Attempt at fixing eslint discoverability in the monorepo

* Support other packages

* Another approach: centralize the eslint dependencies

* Add a script to sync eslint stuffs to the root

* Update package lock files

* Move timing of script to preinstall

* Update package lock files

* No need for this documentation

* Empty commit

* Simplify the script's logic

* Reverting changes for Page tool

* Added comment back

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>

* Fix link

* Reverting the test change

* Update package description

* Remove folder structure section

* @W-19179026: disable streaming responses (#2964)

* Explicitly added example of what the path to your project might look like.

* Update packages/pwa-kit-mcp/README.md

Co-authored-by: Katia Hage <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>

* @W-19248293: logMCPMessage is broken

* @W-19248293: logMCPMessage is broken

* fix lint errors

* @W-19251796 MCP a11y performance tool format fix (#3003)

* @W-19183433: Add code owners validation to the CI pipeline (#2939)

* Update codeowners

* Update codeowners

* Update codeowners

* Add codeowners validator to the pipeline

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

* codeowners validator

---------

Co-authored-by: Brian Feister <[email protected]>

---------

Signed-off-by: yhsieh1 <[email protected]>
Signed-off-by: Ben Chypak <[email protected]>
Signed-off-by: Carson Campbell <[email protected]>
Signed-off-by: Jainam Sheth <[email protected]>
Co-authored-by: snilakandan <[email protected]>
Co-authored-by: Yuming Hsieh <[email protected]>
Co-authored-by: vcua-mobify <[email protected]>
Co-authored-by: snilakandan13 <[email protected]>
Co-authored-by: Ben Chypak <[email protected]>
Co-authored-by: patricksullivansf <[email protected]>
Co-authored-by: vcua-mobify <[email protected]>
Co-authored-by: Ben Chypak <[email protected]>
Co-authored-by: Daniel Diaz <[email protected]>
Co-authored-by: Carson Campbell <[email protected]>
Co-authored-by: Vincent Marta <[email protected]>
Co-authored-by: Shailesh Zirpe <[email protected]>
Co-authored-by: Steffen Eckardt <[email protected]>
Co-authored-by: Jainam Sheth <[email protected]>
Co-authored-by: Jainam Sheth <[email protected]>
Co-authored-by: Joel Uong <[email protected]>
Co-authored-by: sf-henry-semaganda <[email protected]>
Co-authored-by: Alex Vuong <[email protected]>
Co-authored-by: Shailesh Zirpe <[email protected]>
Co-authored-by: wei-liu <[email protected]>
Co-authored-by: atekur <[email protected]>
Co-authored-by: Aditya Tekur <[email protected]>
Co-authored-by: Ujwala <[email protected]>
Co-authored-by: Avinash Kasipathy <[email protected]>
Co-authored-by: Katia Hage <[email protected]>
Co-authored-by: Brian Feister <[email protected]>
@sf-emmyzhang
@W-19263109 fix: cancel order modal a11y
798eaa2
@sf-deepali-bharmal
Align Order Lookup form in center for Auth users (#3044)
31ed766
@sf-deepali-bharmal
fix merge conflict
d3d1e1c
@sf-deepali-bharmal sf-deepali-bharmal requested a review from a team August 13, 2025 23:09
@sf-deepali-bharmal sf-deepali-bharmal requested a review from a team as a code owner August 13, 2025 23:09
@cc-prodsec
Copy link
Collaborator

cc-prodsec commented Aug 13, 2025 •
edited
Loading

🎉 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)

@sf-deepali-bharmal sf-deepali-bharmal added ready for review PR is ready to be reviewed skip changelog Skip the "Changelog Check" GitHub Actions step even if the Changelog.md files are not updated labels Aug 13, 2025
@sf-deepali-bharmal sf-deepali-bharmal changed the base branch from feature/order-management-plugin to develop August 18, 2025 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ready for review PR is ready to be reviewed skip changelog Skip the "Changelog Check" GitHub Actions step even if the Changelog.md files are not updated
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sf-deepali-bharmal @cc-prodsec @sf-emmyzhang @sf-madhuri-uppu