Draft: feat(Notifications, Conflict detection): #3591723 Add conflict notification...

Ravi Maniyarrequested to merge
issue/canvas-3591715:3591715-use-notifications-to-inform-users-about-the-detected-conflicts into 1.x

Adds conflict notification support for detected file conflicts.

  • Shows a toast when pending auto-saves contain conflict items.
  • Keeps this separate from /canvas/api/v0/notifications.
  • Stores conflict notification state in localStorage to avoid repeated toast spam.
  • Shows the toast again if the conflict content changes.
  • Adds the conflict item to Activity Center and badge count.
  • “Resolve conflicts” opens the Review Changes conflict UI without page reload.
  • Uses existing color/spacing tokens for the toast styling.

Testing instructions

  •  Trigger a conflict where /canvas/api/v0/auto-saves/pending returns conflict data.
  •  Confirm the “File conflict detected” toast appears.
  •  Dismiss the toast and confirm it does not keep showing for the same conflict.
  •  Change the conflict response and confirm the toast can appear again.
  •  Click “Resolve conflicts” and confirm Review Changes opens without page reload.
  •  Open Activity Center and confirm the conflict notification appears there.

Closes #3591715

Merge request reports