fix(ui): disable accept/reject buttons in DiffEditor#1103
Open
Conversation
CodeMirror merge view shows accept/reject buttons by default in the unified diff mode. These buttons are confusing since users cannot actually accept or reject changes in this read-only diff view. - Add mergeControls: false to unifiedMergeView configuration - Add Storybook stories for DiffEditor component Fixes: DRC-2683 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Jared Scott <jared.scott@datarecce.io>
![kiloconnect[bot]](https://avatars.githubusercontent.com/in/2193792?s=60&v=4){kind=small}
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Files Reviewed (2 files)
PR AnalysisThis PR fixes the issue where confusing "Accept" and "Reject" buttons were appearing in the Code diff view. These buttons are a default CodeMirror merge view behavior but are inappropriate for our read-only diff viewer since users cannot actually accept or reject changes. Key Changes:
The changes are minimal and focused on addressing the issue. The DiffEditor component remains read-only and the buttons are no longer visible, providing a cleaner user experience. |
Improve comment to explain why revertControls is omitted for side-by-side view while mergeControls must be explicitly set to false for unified view. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Jared Scott <jared.scott@datarecce.io>
danyelf
approved these changes
Feb 5, 2026
Contributor
danyelf
left a comment
danyelf
left a comment
There was a problem hiding this comment.
Looks good; see one very minor comment. Thanks for the quick fix!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
PR checklist
What type of PR is this?
Bug fix
What this PR does / why we need it:
Disables the confusing "Accept" and "Reject" buttons that were appearing in the Code diff view. These buttons are a default CodeMirror merge view behavior but are inappropriate for our read-only diff viewer since users cannot actually accept or reject changes.
Which issue(s) this PR fixes:
Fixes DRC-2683
Special notes for your reviewer:
mergeControls: falseoption was added to theunifiedMergeViewconfigurationMergeView, revert controls are not shown by default (only when explicitly enabled viarevertControls)Does this PR introduce a user-facing change?:
Yes - removes the confusing Accept/Reject buttons from the code diff view.