Fix LT-19237: preserve Data Notebook fields merging record-type layouts#429
Merged
Conversation
The Data Notebook writes one layout per record type, all sharing the same class/type/name and differing only by choiceGuid. Leaving choiceGuid out of the merge key let Send/Receive confuse one record type's layout for another's, dropping most fields from a record type. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Drop the unverifiable SUEL/FamiliaTrujillo user-to-side attribution and note the test data is a trimmed subset of the ticket's reproduction. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
The two-way diff collector keyed Data Notebook layouts on class/type/name only, so record types that differ only by choiceGuid collided and threw a duplicate-key exception when viewing history or change reports. Key on choiceGuid too, matching the merge fix. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Indent the <part> elements in the layout test data with a tab, matching the other tests in this fixture (and real FLEx layout output); they were 4-space indented. Whitespace only; no behavior change. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This comment was marked as outdated.
This comment was marked as outdated.
mark-sil
approved these changes
Jul 2, 2026
mark-sil
left a comment
mark-sil
left a comment
Contributor
There was a problem hiding this comment.
@mark-sil reviewed 3 files and all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on jasonleenaylor).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The Data Notebook writes one layout per record type, all sharing the same class/type/name and differing only by choiceGuid. Leaving choiceGuid out of the merge key let Send/Receive confuse one record type's layout for another's, dropping most fields from a record type.
This change is