Prevent publishing pending changes with unresolved conflicts

Ravi Maniyarrequested to merge
3587526-prevention-of-publishing into 3587526-prevention-of-publishing-be

ACMS-5993, ACMS-6012, ACMS-6006

Client side changes for Prevention of publishing on Conflict in Canvas UI (project/canvas#3587526)

This MR adds conflict handling for pending auto-save changes so users cannot publish changes that have unresolved conflicts.

When a pending change is marked as conflicted, the review UI now:

  • Shows a conflict warning in the unpublished changes panel
  • Disables selection for conflicted changes
  • Excludes conflicted changes from Select All
  • Still allows non-conflicted changes to be selectively published

The pending changes API response is also normalized so the frontend can handle both normal pending changes responses and conflict responses with error metadata.

Edited by Feliksas Mazeikis

Merge request reports