Skip to content

Fix spurious CFC SetOrder during fwdata→crdt sync #2304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myieye merged 4 commits into from
May 28, 2026
Merged

Fix spurious CFC SetOrder during fwdata→crdt sync #2304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79170fa
Skip spurious CFC move when between has no anchors
myieye May 27, 2026
78233aa
Extract BetweenPosition.HasAnchor; replace inline pattern matches
myieye May 27, 2026
2e466d7
Revert "Extract BetweenPosition.HasAnchor; replace inline pattern mat…
myieye May 27, 2026
c54c002
Trim verbose comments on CFC no-anchor guard (#2307)
myieye May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,9 @@ public async Task<ComplexFormComponent> CreateComplexFormComponent(ComplexFormCo
return await repo.FindComplexFormComponent(addEntryComponentChange.EntityId);
}

if (between is not null)
// The orderable diff sends (null, null) for singletons; skip the move so
// revisits in one sync don't bump Order via PickOrder.
if (between is { Previous: not null } or { Next: not null })
{
await MoveComplexFormComponent(existing, between);
}
Expand Down
16 changes: 16 additions & 0 deletions backend/FwLite/MiniLcm.Tests/ComplexFormComponentTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,22 @@ public async Task CreateComplexFormComponent_ReplayingReturnedObject_IsIdempoten
again.Should().BeEquivalentTo(created);
}

[Fact]
public async Task CreateComplexFormComponent_BetweenWithNoAnchors_DoesNotReorderExisting()
{
// Sync can revisit the same CFC with (null, null) — once via SyncComplexForms,
// again via SyncComplexFormComponents. The second call must not reorder.
var first = await Api.CreateComplexFormComponent(
ComplexFormComponent.FromEntries(_complexFormEntry, _componentEntry));
var second = await Api.CreateComplexFormComponent(
ComplexFormComponent.FromEntries(_complexFormEntry, _componentEntry),
new BetweenPosition<ComplexFormComponent>(null, null));

second.Order.Should().Be(first.Order);
var entry = await Api.GetEntry(_complexFormEntryId);
entry!.Components.Should().ContainSingle().Which.Order.Should().Be(first.Order);
}

[Fact]
public async Task CreateComplexFormComponent_UsingTheSameComponentWithSenseDoesNothing()
{
Expand Down
Loading