If/Then/Else - Code Review changes from #2506 and tests from #2466 #2700
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
Added if then else logic to resolve schemas
7 tasks
epicfaace
reviewed
Feb 18, 2022
packages/core/src/utils.js
Outdated
| if (conditionalSchema) { | ||
| return retrieveSchema( | ||
| mergeSchemas( | ||
| retrieveSchema(conditionalSchema, rootSchema, formData), |
There was a problem hiding this comment.
{
if: ...,
then: {minLength: 5},
minLength: 10
}
Expected behavior: inner property (minLength: 5) should override outer property (minLength: 10). We should add a test case for this
And potentially swap these two arguments.
There was a problem hiding this comment.
This test case correctly captures the issue 🎉
packages/core/src/utils.js
Outdated
| export function resolveSchema(schema, rootSchema = {}, formData = {}) { | ||
| if (schema.hasOwnProperty("$ref")) { | ||
| return resolveReference(schema, rootSchema, formData); | ||
| } else if (schema.hasOwnProperty("dependencies")) { | ||
| const resolvedSchema = resolveDependencies(schema, rootSchema, formData); | ||
| return retrieveSchema(resolvedSchema, rootSchema, formData); | ||
| } else if (schema.hasOwnProperty("if")) { |
There was a problem hiding this comment.
See if we can move this to retrieveSchema instead and everything still works.
| return retrieveSchema(resolvedSchemaLessConditional, rootSchema, formData); | ||
| } | ||
| }; | ||
|
|
||
| export function resolveSchema(schema, rootSchema = {}, formData = {}) { |
There was a problem hiding this comment.
Document this
// Resolves references and dependencies and references within branches of allOf
// Called internally by retrieveSchema
| expect(node.querySelector("input[label=postal_code]")).not.eql(null); | ||
| }); | ||
|
|
||
| it("should should render control when data has not been filled in", () => { |
There was a problem hiding this comment.
Suggested change
| it("should should render control when data has not been filled in", () => { | |
| it("should render control when data has not been filled in", () => { |
| formData, | ||
| }); | ||
|
|
||
| // This feels backwards but is basically because undefined equates to true when field is validated |
There was a problem hiding this comment.
Suggested change
| // This feels backwards but is basically because undefined equates to true when field is validated | |
| // An empty formData will make the conditional evaluate to true because no properties are required in the if statement |
…schema-form into 2506-code-review-changes
epicfaace
approved these changes
Feb 18, 2022
7 tasks
|
Estimate on when this will be released? @epicfaace |
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.
Reasons for making this change
I added changes from code review to the PR in #2506 and added integration tests from my PR in #2466
Checklist