-
Notifications
You must be signed in to change notification settings - Fork 24
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
Diagram schema migration #306
Merged
krusche
merged 11 commits into
ls1intum:develop
from
loreanvictor:diagram-schema-migration
Oct 15, 2023
Merged
Diagram schema migration #306
krusche
merged 11 commits into
ls1intum:develop
from
loreanvictor:diagram-schema-migration
Oct 15, 2023
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
matthiaslehnertum
approved these changes
Oct 14, 2023
Looks good to me! Nicely done! Apollon itself as well as the deserialization of v2 diagrams operate as expected. |
Can you merge this one @loreanvictor ? :) |
Unfortunately, I do not seem to have the permission 😅 |
I will merge the PR |
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.
Checklist
I added multiple screenshots/screencasts of my UI changes(NA)I translated all the newly inserted strings into German and English(NA)Motivation and Context
Following up on this discussion: Current model schema of Apollon results in unnecessary conflicts when patching / merging two replicas (e.g. in realtime collaboration) using JSONPatch and JSONPointer standards.
Description
The proposed change will use
id -> element
maps instead of arrays forelement
,relationships
,assessments
andinteractive
fields of the model schema, causing standard patch operations on these collections to become idempotent, and if not directly targeting the same element, commutative, effectively resolving most conflicts that could arise while merging two replicas of the model. It results in a major bump in model version to v3, with import support for v2 models (no export support added atm).Steps for Testing
Test Coverage
There are some other files that are changed by prettier, I have not included them since their coverage is unchanged.