Resolve Save Conflict dialog: resolution select updates wrong field's value

[christb]

EspoCRM version: 10.0.6
PHP version: 8.4.24
Database: PostgreSQL 18.4

Steps to reproduce:

1. Set "optimisticConcurrencyControl": true in the entityDefs of Contact (or any entity using a personName field) and run rebuild.php.
2. In Administration → Settings, disable "Use WebSocket" (so the second session below does not get the record's update pushed to it live).
3. Open the same Contact record's detail view in two separate browser sessions/tabs (both already loaded, not refreshed afterwards).
4. In session 1, change the field "Salutation" to a different value and save. The save succeeds.
5. In session 2, without reloading the record, change any other field (e.g. a text field) and save.
6. The "Resolve Save Conflict" dialog opens in session 2, listing two rows: Name and Salutation.
7. In the Name row, change the "Resolution" select between its three options ("Current", "Actual", "Original") one at a time and observe the value column of both rows after each change.

Expected behavior: Changing the resolution select in the Name row should only affect the value displayed in the Name row.

Actual behavior: Changing the resolution select in the Name row leaves the Name row's displayed value unchanged, but changes the value displayed in the Salutation row instead.

No errors appear in the browser console, the EspoCRM log, or the webserver log — the values are simply attributed to the wrong row.

[yuri]

I think it's almost correct behavior. We just should not display the Person Name field as it's a composite field.