Decoupling changedFiles & conflicts API in PR details & file view #171
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
sinhaviraj
requested review from
bwieger-atlassian-com,
sdzh-atlassian,
cabella-dot and
marcomura
as code owners
sinhaviraj
changed the title
bwieger-atlassian-com
approved these changes
Mar 6, 2025
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.
We found that for larger repos the conflicts API would always time out within 30 seconds and the UI wouldn't load. In order to fix that I have decoupled the changedFiles & conflicts API calls.
Now isConflicted is nomore the property on fileDiffs and is instead stored as an array of conflictedFiles in state. The rendering component would then compare this array with the fileName and if fileName exists in conflictedArray then mark this as a conflicted file.
Loom video explaining the changes - https://www.loom.com/share/097ef30c0301409d95e0b6e12d9e5a63
Loom Video trying the changes on larger repos - https://www.loom.com/share/8681ec2bf2cf4026b3869afdff78c802