Skip to content

Fix #803 (again) ensure the self referencing nodes are removed #809

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
KevinJump merged 1 commit into from
Oct 1, 2025
Merged

Fix #803 (again) ensure the self referencing nodes are removed #809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions uSync.BackOffice/SyncHandlers/SyncHandlerContainerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ protected async Task<IEnumerable<uSyncAction>> CleanFoldersAsync(Guid parentKey)
{
if (folder is null) continue;

logger.LogDebug("Checking Container: {folder} for any childItems [{type}]", folder.Id, folder.GetType()?.Name ?? "Unknown");
actions.AddRange(await CleanFoldersAsync(folder.Key));

if (!await HasChildrenAsync(folder))
Expand Down Expand Up @@ -247,16 +246,18 @@ protected override async Task<IReadOnlyList<OrderedNodeInfo>> GetMergedItemsAsyn

foreach (var item in items)
{
graph.AddRange(SyncHandlerContainerBase<TObject>.GetCompositions(item.Node).Select(x => GraphEdge.Create(item.Key, x)));
graph.AddRange(SyncHandlerContainerBase<TObject>.GetCompositions(item.Node)
.Where(x => item.Key != x) // don't add self references
.Select(x => GraphEdge.Create(item.Key, x)));
}

var cleanGraph = graph.Where(x => x.Node == x.Edge).ToList();
var sortedList = nodes.Keys.TopologicalSort(cleanGraph);
var sortedList = nodes.Keys.TopologicalSort(graph);

if (sortedList is null)
return [.. items.OrderBy(x => x.Level)];

var results = new List<OrderedNodeInfo>();
var results = new List<OrderedNodeInfo>(sortedList.Count);

foreach (var key in sortedList)
{
if (nodes.TryGetValue(key, out OrderedNodeInfo? value) && value is not null)
Expand Down