Skip to content

loop through all fields instead of just local ones for value comparison on upsert #178

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
tengo-lebanidze merged 2 commits into from
Jan 12, 2026
Merged

loop through all fields instead of just local ones for value comparison on upsert #178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
557e3ff
loop through all fields instead of just local ones for value comparis…
emir-sehovic1 Jan 7, 2026
1b234df
Remove key from cloudFlatEntry instead of setting value to null
emir-sehovic1 Jan 12, 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
37 changes: 24 additions & 13 deletions source/Cute.Lib/Contentful/BulkActions/Actions/UpsertBulkAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,30 +428,41 @@ private bool ValuesDiffer(

var contentDisplayField = _contentType!.DisplayField;

foreach (var (fieldName, value) in localFlatEntry)
{
if (fieldName.StartsWith("sys.")) continue;
var allFieldNames = localFlatEntry.Keys
.Concat(cloudFlatEntry.Keys)
.Where(fieldName => !fieldName.StartsWith("sys."))
.ToHashSet();

string? oldValue = null;
foreach (var fieldName in allFieldNames)
{
var existsInLocal = localFlatEntry.TryGetValue(fieldName, out var localValue);
var existsInCloud = cloudFlatEntry.TryGetValue(fieldName, out var cloudValue);

if (cloudFlatEntry.TryGetValue(fieldName, out var oldValueObj))
if (existsInLocal)
{
oldValue = cloudFlatEntry[fieldName]?.ToString();
}
string? oldValue = cloudValue?.ToString();

var isFieldChanged = serializer.CompareAndUpdateEntry(cloudFlatEntry, fieldName, value, _appendFields);
var isFieldChanged = serializer.CompareAndUpdateEntry(cloudFlatEntry, fieldName, localValue, _appendFields);

if (isFieldChanged)
if (isFieldChanged)
{
changedFields.Add(fieldName, (oldValue, localValue));
isChanged = true;
}
}
else if (existsInCloud && !string.IsNullOrEmpty(cloudValue?.ToString()))
{
changedFields.Add(fieldName, (oldValue, value));
changedFields.Add(fieldName, (cloudValue?.ToString(), null));
cloudFlatEntry.Remove(fieldName);
isChanged = true;
}

isChanged = isFieldChanged || isChanged;
}

if (isChanged)
{
var newEntryName = localFlatEntry.ContainsKey($"{contentDisplayField}.{defaultLocale}") ? localFlatEntry[$"{contentDisplayField}.{defaultLocale}"] : localFlatEntry[$"{_matchField}.{defaultLocale}"];
var newEntryName = localFlatEntry.ContainsKey($"{contentDisplayField}.{defaultLocale}")
? localFlatEntry[$"{contentDisplayField}.{defaultLocale}"]
: localFlatEntry[$"{_matchField}.{defaultLocale}"];

NotifyUserInterface($"'{_contentTypeId}' - '{newEntryName}' will be updated.", progressUpdater);

Expand Down