-
Notifications
You must be signed in to change notification settings - Fork 683
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.
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
Pwa 3139 v2 #4124
Merged
Merged
Pwa 3139 v2 #4124
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e3a97e2
PWA-3139::Region is required in PWA although this option is disabled …
glo80771 9555a76
PWA-3139-V1::Resolved region not null issue
glo80771 121b267
PWA-3139-V2::Removed unwanted changes
glo80771 3192aff
PWA-3139-V2::Updated code format
glo80771 5ad6f7c
PWA-3139-V2::Formatted the code
glo80771 c4f3b43
PWA-3139-V2::Added error message for guest users form and resolved nu…
glo80771 f5721fb
PWA-3139-V2::Added error message for guest users form and resolved nu…
glo80771 89190f3
PWA-3139-V2::Updated code review comments
glo80771 6a006e7
Merge branch 'develop' into PWA-3139-V2
glo82145 29c3b44
Merge branch 'develop' into PWA-3139-V2
glo82145 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,6 +134,18 @@ const CustomerForm = props => { | |
<Text type="hidden" field="default_shipping" initialValue={true} /> | ||
); | ||
|
||
const createErrorMessage = JSON.stringify( | ||
errors.get('createCustomerAddressMutation') | ||
); | ||
const updateErrorMessage = JSON.stringify( | ||
errors.get('updateCustomerAddressMutation') | ||
); | ||
const errorMessage = 'region_id is required for the specified country code'; | ||
const regionError = | ||
createErrorMessage?.includes(errorMessage) || | ||
updateErrorMessage?.includes(errorMessage); | ||
|
||
// errors | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. irrelevant information |
||
return ( | ||
<Fragment> | ||
<FormError errors={Array.from(errors.values())} /> | ||
|
@@ -257,9 +269,10 @@ const CustomerForm = props => { | |
/> | ||
</Field> | ||
</div> | ||
|
||
<div className={classes.region}> | ||
<Region | ||
validate={isRequired} | ||
regionError={regionError} | ||
data-cy="CustomerForm-region" | ||
fieldInput={'region[region]'} | ||
fieldSelect={'region[region_id]'} | ||
|
@@ -269,7 +282,20 @@ const CustomerForm = props => { | |
defaultMessage: 'State Required' | ||
})} | ||
/> | ||
{regionError ? ( | ||
<Message> | ||
<div className={classes.regionError}> | ||
<FormattedMessage | ||
id={'validation.isRequired'} | ||
defaultMessage={'isRequired'} | ||
/> | ||
</div> | ||
</Message> | ||
) : ( | ||
'' | ||
)} | ||
</div> | ||
|
||
<div className={classes.postcode}> | ||
<Postcode | ||
validate={isRequired} | ||
|
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use null coalescing