-
-
Notifications
You must be signed in to change notification settings - Fork 736
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
feat: show changes that would be overwritten in change request overview UI #5964
Merged
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
…ten by applying a CR This change adds an algorithm with tests for detecting what changes would be overwritten by applying a CR. Test cases: - It compares strategies regardless of order of keys in the objects. This ensures that two strategies with the same content but different order of keys are compared correctly. - It treats `undefined` or missing segments in old config as equal to `[]` in change - It treats `undefined` or missing strategy variants in old config and change as equal to `[]` - It lists changes in a sorted list with the correct values - It ignores object order on nested objects. Similar to the first point, this does order-insensitive comparison for nested objects (such as params and constraints).
Because the types are different, there's no chance of mixing them up
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Ignored Deployment
|
thomasheartman
changed the base branch from
main
to
feat/add-conflict-detection-algorithm
January 19, 2024 06:54
thomasheartman
force-pushed
the
feat/display-changes-to-be-overwritten
branch
from
January 19, 2024 07:00
1bdebaf
to
4d0e19b
Compare
thomasheartman
force-pushed
the
feat/add-conflict-detection-algorithm
branch
from
January 19, 2024 07:57
c31ca2a
to
83b29b4
Compare
thomasheartman
force-pushed
the
feat/display-changes-to-be-overwritten
branch
from
January 19, 2024 08:27
8fb9e50
to
54da1d5
Compare
Base automatically changed from
feat/add-conflict-detection-algorithm
to
main
January 19, 2024 09:08
thomasheartman
force-pushed
the
feat/display-changes-to-be-overwritten
branch
from
January 19, 2024 12:28
58bc896
to
2d54328
Compare
andreas-unleash
approved these changes
Jan 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LG
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.
This PR adds a first, rough iteration of what it could look like to show changes that would be overwritten by applying a PR.
The changes are listed in a table (semantically; looks more like a list visually) and show the property, the current live value and the version that you have in your changes. The changes are hidden by default, but can be shown by expanding a details element.
@nicolaesocaciu Suggested that we merge this version for now and iterate on the design later.
Here's what it looks like closed:
Here's what it looks like with a typical change load:
Here's what it looks like if you change more or less every property changed: