Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: show the updated value instead of the snapshot value (#5989)
This PR fixes a bug in the displayed value of the conflict list so that it shows the value it would update to instead of the snapshot value. In doing so, it updates the logic of the algorithm to: 1. if the snapshot value and the current value are the same, it's not a conflict (it's an intended change) 2. If the snapshot value differs from the current value, it is a conflict if and only if the value in the change differs from the current value. Otherwise, it's not a conflict. The new test cases are: - it shows a diff for a property if the snapshot and live version differ for that property and the changed value is different from the live version - it does not show a diff for a property if the live version and the change have the same value, even if the snapshot differs from the live version - it does not show a diff for a property if the snapshot and the live version are the same
- Loading branch information
1 parent
13a9b1b
commit 01318b1
Showing
2 changed files
with
142 additions
and
33 deletions.
There are no files selected for viewing
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
100 changes: 72 additions & 28 deletions
100
.../component/changeRequest/ChangeRequest/Changes/Change/strategy-change-diff-calculation.ts
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