See update conflicts in Entity table

[matthew-white]

See the story in the release criteria.

---

Related:

• Add version conflicts to entity updates #511
• Added conflict property in Entity Odata central-backend#1024
• Feature/entities/resolve conflict central-backend#1023
• Minor fixes for Resolve Conflict central-backend#1037
• Features/entities/relevant to conflict flag central-backend#1028
• Show conflict icon on Entity List data table central-frontend#882
• Added conflict resolution modal central-frontend#883
• Added 'Edit Entity' functionality to Resolve modal central-frontend#884
• Add entity conflict summary table #529

[matthew-white]

I'm going to move this back to "in progress", since I still need to add the conflict summary table to the modal (#529). I'll assign myself to the issue. Once the table is done, I think this story will be ready for QA and design review.

[issa-tseng]

there's awkwardly much distance between the alert icon and the >
if i take 8px out of the distance it looks nicer but it seems like it should be aligned or floated right instead of the width being changed as i did it

as i think sadiq expressed, the alert icon is pretty big. if i take the icon font size down to 12px, the circle to 22px, and realign the icon it looks nicer

as szymon notes, titlebar is still magenta. i can live with it

at least in safari i see the first header column is collapsed, that column we should see at least the full static contents.

have not personally tested project viewer but looks good otherwise

[srujner]

Tested with Success!

[dbemke]

Tested with Success!

[matthew-white]

there's awkwardly much distance between the alert icon and the > if i take 8px out of the distance it looks nicer but it seems like it should be aligned or floated right instead of the width being changed as i did it

as i think sadiq expressed, the alert icon is pretty big. if i take the icon font size down to 12px, the circle to 22px, and realign the icon it looks nicer

I've made these changes as part of getodk/central-frontend#903. I similarly adjusted the alert icon in the table of entity lists.

at least in safari i see the first header column is collapsed, that column we should see at least the full static contents.

I left a related comment about these column widths in the release criteria.

have not personally tested project viewer but looks good otherwise

I don't think this was in place when you took a look, but it should be now that #538 is closed.