See summary of update conflicts on Entity Detail page

[matthew-white]

See the story in the release criteria.

---

Related:

• Add version conflicts to entity updates #511
• Features/entities/relevant to conflict flag central-backend#1028
• Add relevantToConflict field in the GET /versions response central-backend#1038
• Add first version of entity conflict summary box #530
• Add entity conflict summary table #529

[issa-tseng]

same first-column width issue in the table as the other story

and also the columns should be a minimum of 50px, not always 50px

[dbemke]

Just to make sure. In the release criteria there's no information about e.g. text "overwritten", "conflicts.." but it's in the screenshot. Is it ok that those texts don't appear on the staging?

[dbemke]

From the release criteria: "When I click on the source name, the page should scroll to that entry in the feed" . Does this rule apply only if I click the source name in the conflicts table? If I click the version in "Data updated by submission.... v .." the page also scroll to this feed (present in the URL and outlined blue).
Example in the video:
https://jam.dev/c/baa0ebe8-ea61-4d4d-ab65-ca8bf5041255

[dbemke]

After clicking the source name, the page scroll to the entry in the feed (+blue outline). After that if I click e.g. a tab in a different parallel update feed (without clicking on the version), should the bkue outline and scrolling to the place be removed? If not, in which cases it should be removed (e.g. clicking different source in the table with conflicts, editing entity)?
Example in the video:
https://jam.dev/c/001efffa-e0c1-4854-a903-9cedc4ce9180

[dbemke]

The green check icon for the known good version doesn't appear in the table of conflicts after resolving conflicts. After resolving conflicts and creating new ones all conflict are shown in the table
Steps to reproduce:

1. Create a conflicts and resolve it.
2. Update the entity from the most current version (Collect or Enketo).
3. Create another conflict.
4. Check what is the last known good version.
   I used this entity and trees update form in this project:
   https://staging.getodk.cloud/#/projects/20/entity-lists/trees/entities/0e1c22f4-9345-42a0-8da3-e493514843fe

[matthew-white]

Just to make sure. In the release criteria there's no information about e.g. text "overwritten", "conflicts.." but it's in the screenshot. Is it ok that those texts don't appear on the staging?

Yes, that's OK, that screenshot was an earlier mockup.

From the release criteria: "When I click on the source name, the page should scroll to that entry in the feed" . Does this rule apply only if I click the source name in the conflicts table? If I click the version in "Data updated by submission.... v .." the page also scroll to this feed (present in the URL and outlined blue).

@ktuite made the v123 version number label a link so that it's easy to copy a link to a particular version.

After clicking the source name, the page scroll to the entry in the feed (+blue outline). After that if I click e.g. a tab in a different parallel update feed (without clicking on the version), should the bkue outline and scrolling to the place be removed? If not, in which cases it should be removed (e.g. clicking different source in the table with conflicts, editing entity)?

Curious what @issa-tseng thinks! As it's supposed to work now, clicking between Author's View and Central's View shouldn't remove the blue outline. However, if you take an action that refreshes the feed (editing the entity, marking it as resolved), you should not see the previous blue outline. However, even in that case, you should still see the version number in the URL. If there's a version number in the URL, then no action will remove it (only maybe change it). If you click a different source, that should scroll to a different version and change the URL.

The green check icon for the known good version doesn't appear in the table of conflicts after resolving conflicts. After resolving conflicts and creating new ones all conflict are shown in the table

That definitely sounds like a bug. Would you mind filing a new issue about that?

[matthew-white]

The green check icon for the known good version doesn't appear in the table of conflicts after resolving conflicts. After resolving conflicts and creating new ones all conflict are shown in the table

OK, I think we've fixed this one now. Would you mind taking a look?

[dbemke]

The last known good version is fixed

[dbemke]

I found an example of a conflict which is mark a soft conflict but looking at the version I think it should be a hard conflict (v37-v44)? The properties didn't change but the update (v37) was made on out of date version.
I used a Tree update form without required questions and left the updated properties empty (via Collect). I think after second time I left the property empty the grayed out info about the previous property disappeared
https://staging.getodk.cloud/#/projects/20/entity-lists/trees/entities/0e1c22f4-9345-42a0-8da3-e493514843fe#v41

Another example of soft conflict/hard conflict v2-v5 (Entity updated via Enketo)
https://staging.getodk.cloud/#/projects/56/entity-lists/trees/entities/9ac8deca-fbe7-4f68-affd-c8ea978c3355

[lognaturel]

For the first case, it looks like some of the submissions that led to updates (like the ones that led to v38, 39, 40) included blank values for geometry. Because they all included the same value (blank), they're not considered conflicting updates.

For the second one, it looks like two updates were made in parallel and changed one property to the same value. Looking at the second case, both the submission that created v3 and the submission that created v4 set the circumference to 12. That also happened to be what the submission that created v2 set it to so from the entity perspective there was no change. That means when the last parallel update came in that was also based on v2, its changes were applied without a hard conflict because the properties it modified had not been changed by other submissions based on v2.

[dbemke]

Tested with success!

[srujner]

Tested with success!