(feat) O3-3061: Support for conditional answered validation #297
Conversation
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
arodidev
force-pushed
the
conditional-answered
branch
from
65ef997
to
ecb2b4a
Compare
|
Opened this work for review purposes pending tests. |
arodidev
changed the title
samuelmale
reviewed
May 31, 2024
| if (field.meta?.submission) { | ||
| setErrors((prevErrors) => [...prevErrors, ...(field.meta.submission.errors || [])]); | ||
| setWarnings((prevWarnings) => [...prevWarnings, ...(field.meta.submission.warnings || [])]); | ||
| if (field.meta?.submission?.errors) { |
There was a problem hiding this comment.
The meta object is initialised at a earlier stage so it's not necessary to optionally chain it.
src/utils/form-helper.ts
Outdated
| @@ -37,6 +37,16 @@ export function isInlineView( | |||
| return renderingType == 'single-line'; | |||
| } | |||
|
|
|||
| export function evaluateConditionalAnswered(field: FormField, flattenedFields: FormField[]) { | |||
| const { referenceQuestionId, referenceQuestionAnswers, values, fields, message } = config; | ||
|
|
||
| const referencedField = fields.find((field) => field.id === referenceQuestionId); | ||
| const referencedFieldValue = values[referencedField.id] || referencedField.meta?.submission?.newValue?.value; |
There was a problem hiding this comment.
The second part of the expressions presupposes the underlying field to be capturing an obs. I think referencing the values object should suffice.
| const referencedField = fields.find((field) => field.id === referenceQuestionId); | ||
| const referencedFieldValue = values[referencedField.id] || referencedField.meta?.submission?.newValue?.value; | ||
|
|
||
| if (!referencedFieldValue || !referenceQuestionAnswers.includes(referencedFieldValue)) { |
There was a problem hiding this comment.
Shouldn't we being doing something like:
if (!isEmpty(value) && !referenceQuestionAnswers.includes(referencedFieldValue)) {
return [{ resultType: 'error', errCode: 'invalid.valueSelected', message: message }];
}
CynthiaKamau
reviewed
Jun 4, 2024
src/form-engine.test.tsx
Outdated
| @@ -156,6 +157,52 @@ describe('Form engine component', () => { | |||
| }); | |||
| }); | |||
|
|
|||
| describe('conditional answered validation', () => { | |||
| it('should fail if target field has a value but no value is selected on the referenced field', () => {}); | |||
CynthiaKamau
approved these changes
Jun 4, 2024
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.
Requirements
Summary
This PR aims to introduce conditional answered validation to the form's engine.
Screenshots
Screen.Recording.2024-05-30.at.19.59.17.mov
Related Issue
https://openmrs.atlassian.net/browse/O3-3061
Other