support conflict block - #1104
Open
andreisakirkinepam wants to merge 2 commits into
Open
Conversation
Collaborator
|
@copilot resolve the merge conflicts in this pull request |
Collaborator
|
@copilot resolve the merge conflicts in this pull request |
There was a problem hiding this comment.
Pull request overview
This PR adds frontend support for “conflict” extraction blocks in the Extraction Editor by surfacing conflict styling and enabling switching between multiple OCR variants that share a conflict group.
Changes:
- Add conflict-aware rendering in
ExtractionBlock(conflict highlighting + variant tab switcher + visibility toggling). - Extend TipTap schema to preserve
<span>nodes/attributes from hOCR so conflict target/comment spans can be styled. - Add mock hOCR content and tests covering conflict block highlighting and conflict variant tab switching.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 7 comments.
Show a summary per file
| File | Description |
|---|---|
| web/frontend/src/mocks/data/extractions/conflict_tabs.hocr | Adds a mock hOCR sample containing a conflict group with multiple variants. |
| web/frontend/src/features/workspace/components/extraction-editor.tsx | Removes now-unused conditional editability logic (customTab-based). |
| web/frontend/src/features/workspace/components/extraction-editor.test.tsx | Adds tests for conflict highlighting and conflict-variant tab switching behavior. |
| web/frontend/src/features/workspace/components/extraction-editor-extensions.ts | Introduces an OcrSpan TipTap node to preserve span structure/attrs from hOCR. |
| web/frontend/src/features/workspace/components/extraction-block.tsx | Implements conflict rendering, variant discovery, and tab-driven variant visibility. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Collaborator
|
@khyurri please have a look |
Collaborator
|
@copilot resolve the merge conflicts in this pull request |
andreisakirkinepam
force-pushed
the
1075-support-conflict-block
branch
from
June 11, 2026 11:49
45ef2b3 to
2828213
Compare
sem0ark
approved these changes
Jun 14, 2026
sem0ark
left a comment
sem0ark
left a comment
Collaborator
There was a problem hiding this comment.
Retested from the previous issue, bug with removal is fixed, approved.
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
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.
No description provided.