feat: Improve versioned change requests to handle multiple open CRs for single feature #4245
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎ 3 Skipped Deployments
|
github-actions
bot
added
api
|
Uffizzi Preview |
github-actions
bot
added
feature
github-actions
bot
added
feature
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #4245 +/- ##
==========================================
+ Coverage 96.79% 96.81% +0.02%
==========================================
Files 1162 1165 +3
Lines 38248 38508 +260
==========================================
+ Hits 37021 37281 +260
Misses 1227 1227 ☔ View full report in Codecov by Sentry. |
github-actions
bot
added
feature
…change-requests-for-single-feature
github-actions
bot
added
feature
github-actions
bot
added
feature
|
|
|
|
matthewelwell
force-pushed
the
feat(versioning)/handle-multiple-change-requests-for-single-feature
branch
from
17cabe9
to
dc23c92
Compare
github-actions
bot
added
feature
matthewelwell
force-pushed
the
feat(versioning)/handle-multiple-change-requests-for-single-feature
branch
from
dc23c92
to
c74be59
Compare
github-actions
bot
added
feature
github-actions
bot
added
feature
…change-requests-for-single-feature
github-actions
bot
added
feature
…change-requests-for-single-feature
github-actions
bot
added
feature
matthewelwell
force-pushed
the
feat(versioning)/handle-multiple-change-requests-for-single-feature
branch
from
6300a7f
to
f17678b
Compare
github-actions
bot
added
feature
matthewelwell
deleted the
feat(versioning)/handle-multiple-change-requests-for-single-feature
branch
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.
Changes
This PR is the 'Core' part of the resolution to #4145.
In this PR, I've added most of the business logic which hinges on the
VersionChangeSetmodel. This model is created alongside a change request (as per the code in this workflows PR) and holds the information about the changes that should be applied when the change request is published (or goes live if it's scheduled).The reason for this is to remove the need to duplicate the version when a change request is created, resulting in conflicts / clobbering of changes that happen between PR creation and publish.
As part of this work, however, we need to account for the fact that there could still be conflicts, they're just less likely and less destructive. The conflict behaviour here checks if changes have been made to the same component of a feature in a given environment (e.g. a specific segment override, or the environment default value). These conflicts are then surfaced by the FE to provide visibility.
How did you test this code?
I've added enough tests in this repository to satisfy the coverage requirements, but a lot of the testing has been done via full integration tests in the flagsmith-workflows PR here.