Overview

We are adding "Conflict resolution UI". This is the first task of the many and will add basic UI elements based on designs (meta issue with designs pending).

Proposed resolution

Add “Selective publishing error” UI element to the “Selective publishing dropdown” panel.
Add a CTA button intended to open conflict resolution UI that also contains conflict counter.

User interface changes

When a "resolvable conflict" is detected in Canvas UI, the following UI elements become available:

  1. A div with specific styling and colour identifying conflict detection
  2. Label with conflict counter
  3. A CTA button intended to open conflict resolution UI that also contains conflict counter.

Designs

All designs made by @mark-dodgson and exported as PNGs from Figma.

  1. Conflict detected CTA and marked entities in the "Review changes" panel:
    Design for the "Review changes" panel when conflicts are detected within the Canvas UI
  2. "Review changes" panel section:
    Design for just the "Review changes" panel when conflicts are detected
  3. Conflict resolution CTA section in "Review changes" panel:
    Design for the conflict resolution CTA inside of the review changes dropdown
CommentFileSizeAuthor
#5 Conflict 6 - CTA in review changes.png16.24 KBf.mazeikis

Issue fork canvas-3585970

Command icon Show commands

Start within a Git clone of the project using the version control instructions.

Or, if you do not have SSH keys set up on git.drupalcode.org:

About issue forks

Comments

f.mazeikis created an issue. See original summary.

ravi.maniyar.123’s picture

ravi.maniyar.123 commented
Assigned: Unassigned » ravi.maniyar.123

ravi.maniyar.123 opened merge request !945

f.mazeikis’s picture

f.mazeikis commented
Title: Add Rudimentary Conflict resolution UI » UI changes for detection of conflicts caused by external updates to underlying entity of auto-save entry
Parent issue: » #3587587: [META] Review of changes and Conflict resolution

Renaming the issue, as there will be a separate issue for the "rudimentary conflict resolution UI" 😅

Also adding the designs this work is based on.

f.mazeikis’s picture

f.mazeikis commented
Issue summary: View changes
StatusFileSize
new Conflict 6 - CTA in review changes.png16.24 KB
f.mazeikis’s picture

f.mazeikis commented

For the reviewers (Hi @justafish 👋) - there will be two MRs in this issue:

  1. React changes (FE bits) are in(!MR945) 3585970-add-rudimentary-conflict
  2. PHP and openapi changes (BE bits) will be in canvas-3585970/3585970-page-autosaves-pending-conflict-detecion

justafish made their first commit to this issue’s fork.

justafish’s picture

justafish
she/her
Primary language English
Location London, UK
commented
Status: Active » Needs work