fix: Fixed #3744 and another precompiled schema issue #3763
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
Fixes rjsf-team#3744 as well as an issue associated with anyOf/oneOf in precompiled schema - In `@rjsf/util`, fixed part of rjsf-team#3744 and the precompiled schema issue as follows: - Updated `getClosestMatchingOption()` to resolve refs in the options before computing the correct index, as well as supporting `anyOf` and discriminators in `calculateIndexScore()` - Updated `getDefaultFormState()` to merge in the remaining schema into the selected anyOf/oneOf option prior to computing new defaults - Updated `retrieveSchema()` to merge in the remaining schema into the anyOf/oneOf options when resolving dependencies - Added/updated tests to verify all the fixes - In `@rjsf/core`, fixed the rest of rjsf-team#3744 by updating `MultiSchemaField` to merge the remaining schema into the selected anyOf/oneOf selected option - Also updated `SchemaField` to no longer pass in `baseType` to `MultiSchemaField` since it is no longer used
nickgros
reviewed
Jul 13, 2023
Comment on lines
+211
to
+213
| testValidator.setReturnValues({ | ||
| isValid: [false, false, false, false, false, false, false, true], | ||
| }); |
There was a problem hiding this comment.
Wondering if in some places it might be more readable/maintainable if we stubbed the implementation to return isValid for a specific subschema (in this case the second anyOf) instead of relying on ordering.
There was a problem hiding this comment.
Most likely... What were you thinking of changing?
nickgros
reviewed
Jul 13, 2023
nickgros
approved these changes
Jul 13, 2023
Co-authored-by: Nick Grosenbacher <nickgrosenbacher@gmail.com>
4 tasks
4 tasks
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
Fixes #3744 as well as an issue associated with anyOf/oneOf in precompiled schema
@rjsf/util, fixed part of Odd behaviour of anyOf/oneOf #3744 and the precompiled schema issue as follows:getClosestMatchingOption()to resolve refs in the options before computing the correct index, as well as supportinganyOfand discriminators incalculateIndexScore()getDefaultFormState()to merge in the remaining schema into the selected anyOf/oneOf option prior to computing new defaultsretrieveSchema()to merge in the remaining schema into the anyOf/oneOf options when resolving dependencies@rjsf/core, fixed the rest of Odd behaviour of anyOf/oneOf #3744 by updatingMultiSchemaFieldto merge the remaining schema into the selected anyOf/oneOf selected optionSchemaFieldto no longer pass inbaseTypetoMultiSchemaFieldsince it is no longer usedChecklist
npm run test:updateto update snapshots, if needed.