Dereference option schemas before giving it as props to anyOf and oneOf #2270
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
epicfaace
reviewed
Mar 10, 2021
| @@ -132,7 +132,10 @@ class AnyOfField extends Component { | |||
| } | |||
|
|
|||
| const enumOptions = options.map((option, index) => ({ | |||
There was a problem hiding this comment.
Does it make sense to instead just set option = retrieveSchema(option, registry.rootSchema) earlier in this function, so that everything related to the option is already dereferenced (this might fix other bugs with oneOf / refs)?
There was a problem hiding this comment.
Sure. I guess I'll update the samples as well then since this will ignore any title that is a sibling to a $ref.
Actually; if you look the reference sample. There you have a reference to the same schema but with different titles. That wouldn't be possible if we changed like above. We could implement your suggestion but still look for title in the $ref schema.
What do you think?
There was a problem hiding this comment.
I've moved the logic to SchemaField instead, so props.options are now dereferenced. That also fixes #1819
|
@epicfaace I've now updated the options so they are all dereferenced from the beginning. I have an issue running Those |
NixBiks
changed the title
This was referenced Mar 12, 2021
Thanks. Yeah, it might be a race condition. Try running |
|
I'll close this in favour of #2272 |
epicfaace
added a commit
that referenced
this pull request
Apr 13, 2021
… contain references (#2272) * fix: title from refs schema before fallback value * Added test for #2270 * After review * Add formData when dereferencing * Moved logic to SchemaField, so props.options are already dereferenced * Removed wrong comment * Fix: refs should be included when determining matching option based on formData * Integrated tests from PR #2245 * Added a new test * Updated tests after review * Update isValid to take rootSchema * * use global ajv in isValid * simplify withIdRefPrefix * add comments * improve error handling * Added test and fixed withIdRefPrefix for arrays * * Cleaned up * Fixed bug with $ref being a property * added tests for withIdRefPrefix * * Clean up * Check for # in ref * update tests * Added upgrade note * Change title of test in validate_test Co-authored-by: Ashwin Ramaswami <[email protected]> * Change title of test in validate_test Co-authored-by: Ashwin Ramaswami <[email protected]> * Added test with ref within properties Co-authored-by: Ashwin Ramaswami <[email protected]>
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 #2016 and #1819
If this is related to existing tickets, include links to them as well.
Checklist