Skip to content

fix - remove tab when deleted from file fixes: #923 #940

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 3 commits into from
Apr 9, 2026
Merged

fix - remove tab when deleted from file fixes: #923 #940

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e37394
fix - remove tab when deleted from file fixes: #923
KevinJump Apr 9, 2026
eee5143
Update uSync.Core/Serialization/Serializers/ContentTypeBaseSerializer.cs
KevinJump Apr 9, 2026
e59f263
Update uSync.Core/Serialization/Serializers/ContentTypeBaseSerializer.cs
KevinJump Apr 9, 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
72 changes: 33 additions & 39 deletions uSync.Core/Serialization/Serializers/ContentTypeBaseSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,55 +1004,49 @@ protected void CleanTabAliases(TObject item)

protected IEnumerable<uSyncChange> CleanTabs(TObject item, XElement node, SyncSerializerOptions options)
{
if (options.DeleteItems())
{
var tabNode = node?.Element("Tabs");
if (tabNode == null) return [];
if (options.DeleteItems() is false) return [];

var newTabs = tabNode.Elements("Tab")
.Select(x => GetTabAliasFromTabGroup(x))
.ToList();
var tabNode = node?.Element("Tabs");
if (tabNode == null) return [];

var inheritedTabs = item.CompositionPropertyGroups.Select(x => x.Alias).ToList();
var newTabs = tabNode.Elements("Tab")
.Select(x => GetTabAliasFromTabGroup(x))
.ToList();

List<PropertyGroup> removals = [];
foreach (var tab in item.PropertyGroups)
{
// don't remove the inherited tabs
if (inheritedTabs.Contains(tab.Alias)) continue;
var inheritedTabs =
item.ContentTypeComposition
.SelectMany(c => c.CompositionPropertyGroups.Select(x => x.Alias))
.Distinct()
.ToList();

if (!newTabs.InvariantContains(tab.Alias))
{
removals.Add(tab);
}
}
PropertyGroup[] removals = item.PropertyGroups
.Where(x => x is not null
&& inheritedTabs.InvariantContains(x.Alias) is false // don't touch inherited tabs
&& newTabs.InvariantContains(x.Alias) is false) // only include tabs we don't have in the xml
.ToArray();

if (removals.Count > 0)
{
var changes = new List<uSyncChange>();
if (removals.Length == 0) return [];

foreach (var tab in removals)
{
if (tab.PropertyTypes?.Count > 0)
{
logger.LogWarning("Not removing {tab} as it still has properties {properties}", tab.Alias,
String.Join(",", tab.PropertyTypes.Select(x => x.Name)));
}
else
{
if (logger.IsEnabled(LogLevel.Information))
logger.LogInformation("Removing tab : {alias}", tab.Alias);

changes.Add(uSyncChange.Delete($"Tabs/{tab.Alias}", tab.Alias, tab.Alias));
item.PropertyGroups.Remove(tab);
}
}
var changes = new List<uSyncChange>();
foreach (var tab in removals)
{
if (tab.PropertyTypes?.Count > 0)
{
logger.LogWarning("Not removing {tab} as it still has properties {properties}", tab.Alias,
String.Join(",", tab.PropertyTypes.Select(x => x.Name)));
changes.Add(uSyncChange.Warning($"Tabs/{tab.Alias}", $"Tab: {tab.Alias}", $"Tab '{tab.Alias}' not removed because it still has properties: {String.Join(",", tab.PropertyTypes.Select(x => x.Name))}"));
}
else
{
if (logger.IsEnabled(LogLevel.Information))
logger.LogInformation("Removing tab : {alias}", tab.Alias);

return changes;
changes.Add(uSyncChange.Delete($"Tabs/{tab.Alias}", $"Tab {tab.Alias}", tab.Alias));
item.PropertyGroups.Remove(tab);
}
}

return [];
return changes;
}

protected async Task CleanFolderAsync(TObject item, XElement node)
Expand Down
Loading