feat(Conflict detection): #3591591 Expand conflict resolution UI with...

Ravi Maniyarrequested to merge
issue/canvas-3591752:3591752-add-side-by-side-review-flow-for-selected-page-changes into 1.x

[Description of changes]

Adds a side-by-side review flow for selected non-conflicted Page changes before publishing.

Changes include:

  • Added a Review Changes route/view for selected pending Page changes.
  • Reused the shared page version comparison UI for visual/text comparison.
  • Allows selecting either the published version or the autosave/new version.
  • Selecting the published version discards the pending autosave change.
  • Selecting the new version keeps it selected and publishes it from the action button.
  • Added the all-files-reviewed state with publish/close actions.
  • Kept conflict resolution behavior separate so existing conflict detection and conflict comparison flows are not affected.
  • Added Storybook coverage for the review panel states.
  • Added/updated unit and Playwright coverage for the review flow.

Testing instructions

  • Open the unpublished changes dropdown.
  • Select one or more non-conflicted Page changes.
  • Click "Review selected changes".
  • Confirm the side-by-side comparison opens.
  • Select "Old version" and confirm the action discards the pending change.
  • Select "New version" and confirm the action publishes selected changes.
  • Confirm conflict resolution flow still works separately.

Tested locally:

  • npm run type-check
  • npm test -- src/features/review/ReviewChangesPage.test.tsx src/features/versionComparison/PageVersionComparisonView.test.tsx
  • npm run build-storybook
  • Playwright coverage for conflict/review flow

Closes #3591752

Merge request reports