Skip to content

backport PR #2631 to take into account additionalProperties set to false #2940

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

Merged
merged 7 commits into from
Aug 19, 2022

Conversation

Lausselloic
Copy link
Contributor

@Lausselloic Lausselloic commented Jul 19, 2022

backport #2631 in v5

@heath-freenome
Copy link
Member

@Lausselloic Sorry about the conflicts, but I needed to reformat the code to match the coding styles... Can you rebase and resolve the conflicts?

@heath-freenome
Copy link
Member

@Lausselloic so there is a competing change #2853 that does things a bit differently to solve a bigger issue... What are your thoughts about that one vs yours?

@Lausselloic
Copy link
Contributor Author

Hello, both fixes solved my issue, so both are great.

@Lausselloic Lausselloic force-pushed the rjsf-v5-backport-pr2631 branch from 7c0ab4b to cb204f3 Compare July 22, 2022 09:25
@Lausselloic
Copy link
Contributor Author

@heath-freenome I've update my PR to take the other fix. I was unable to build the entire packages locally so I wasn't able to run the test proposed here : https://github.com/rjsf-team/react-jsonschema-form/pull/2853/files#diff-b7cc040be2092e8b4493e2f99a74e1b5b43189cdd143f96ce81752c357462aa0L3212

@lpillonel does this fix sounds good to you too?

@lpillonel
Copy link
Contributor

It looks ok for me yep

@heath-freenome
Copy link
Member

@Lausselloic it looks like you'll need to run the npm run cs-format command on the PR to fix formatting issues. I would recommend fetching the latest rjsf-v5 branch and rebase your code on top of it first.

Lausselloic and others added 4 commits July 29, 2022 09:44
…set to false in schema

# Conflicts:
#	packages/utils/src/schema/toPathSchema.ts
#	packages/utils/test/schema/toPathSchemaTest.ts
@Lausselloic Lausselloic force-pushed the rjsf-v5-backport-pr2631 branch from c951996 to 730af54 Compare July 29, 2022 07:49
@heath-freenome
Copy link
Member

@Lausselloic You'll need to resolve conflicts now. Also do run the npm run cs-format tool as well

@heath-freenome
Copy link
Member

@Lausselloic Just checking in to see whether you'll be able to update this PR before we merged the branch into master sometime next week

@heath-freenome heath-freenome merged commit ee9b46a into rjsf-team:rjsf-v5 Aug 19, 2022
heath-freenome added a commit to heath-freenome/react-jsonschema-form that referenced this pull request Aug 27, 2022
…set to false (rjsf-team#2940)

* backport PR rjsf-team#2631 to take into account additionalProperties set to false in schema

# Conflicts:
#	packages/utils/src/schema/toPathSchema.ts
#	packages/utils/test/schema/toPathSchemaTest.ts

* move to fix from rjsf-team#2853

* fix linting error

* run cs-format on modified files

* Update packages/utils/src/schema/toPathSchema.ts

Fix formatting (hopefully)

* Update packages/utils/src/schema/toPathSchema.ts

Second try fixing formatting

Co-authored-by: LAUSSEL Loic INNOV/IT-S <[email protected]>
Co-authored-by: Heath C <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants