-
Notifications
You must be signed in to change notification settings - Fork 47
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
pkp/pkp-lib#9996 Initial attempt to ignore hidden fields for validate… #357
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f02b0f4
pkp/pkp-lib#9996 Remove error for input that gets hidden
jardakotesovec 540f397
pkp/pkp-lib#9996 check only visible fields for required
jardakotesovec b717553
pkp/pkp-lib#9996 Handle correctly multiple fields removing error sync…
jardakotesovec 2be9225
pkp/pkp-lib#9996 add jsdocs
jardakotesovec 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/** | ||
* Should a field be shown? | ||
* | ||
* @param {Object} field One of this.fields | ||
* @return {Boolean} | ||
*/ | ||
export function shouldShowFieldWithinGroup(field, allFields) { | ||
if (typeof field.showWhen === 'undefined') { | ||
return true; | ||
} | ||
const whenFieldName = | ||
typeof field.showWhen === 'string' ? field.showWhen : field.showWhen[0]; | ||
const whenField = allFields.find((field) => field.name === whenFieldName); | ||
if (!whenField) { | ||
return false; | ||
} | ||
if (typeof field.showWhen === 'string') { | ||
return !!whenField.value; | ||
} | ||
return whenField.value === field.showWhen[1]; | ||
} | ||
/** | ||
* Should a group be shown? | ||
* | ||
* @param {Object} group One of this.groups | ||
* @return {Boolean} | ||
*/ | ||
export function shouldShowGroup(group, fields) { | ||
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.
|
||
if (typeof group.showWhen === 'undefined') { | ||
return true; | ||
} | ||
const whenFieldName = | ||
typeof group.showWhen === 'string' ? group.showWhen : group.showWhen[0]; | ||
const whenField = fields.find((field) => field.name === whenFieldName); | ||
if (!whenField) { | ||
return false; | ||
} | ||
if (typeof group.showWhen === 'string') { | ||
return !!whenField.value; | ||
} | ||
return whenField.value === group.showWhen[1]; | ||
} | ||
|
||
/** | ||
* Should a field be shown? | ||
* | ||
* @param {Object} field One field to check | ||
* @param {Object} fields All form fields | ||
* @param {Object} groups All form groups | ||
* @return {Boolean} | ||
*/ | ||
|
||
export function shouldShowField(field, fields, groups) { | ||
const group = groups.find((group) => group.id === field.groupId); | ||
|
||
return ( | ||
shouldShowGroup(group, fields) && shouldShowFieldWithinGroup(field, fields) | ||
); | ||
} |
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.
allFields
doesn't have a JSDoc comment above.