SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Undo putting _type first for now

Browse source
This commit is contained in:
Robin Sue 2024-11-29 13:31:15 +01:00
parent c4a6ce2796
commit 3bc1cc3ae6
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/modules/Elsa.Workflows.Core/Serialization/Converters/PolymorphicObjectConverter.cs
View file

@ -199,8 +199,8 @@ public class PolymorphicObjectConverter(IWellKnownTypeRegistry wellKnownTypeRegi
if (type == typeof(JObject) || type == typeof(JArray) || type == typeof(JsonObject) || type == typeof(JsonArray))
{
writer.WriteStartObject();
writer.WriteString(TypePropertyName, type.GetSimpleAssemblyQualifiedName());
writer.WriteString(IslandPropertyName, value.ToString());
writer.WriteString(TypePropertyName, type.GetSimpleAssemblyQualifiedName());
writer.WriteEndObject();
return;
}
@ -245,6 +245,20 @@ public class PolymorphicObjectConverter(IWellKnownTypeRegistry wellKnownTypeRegi
writer.WriteStartObject();
if (jsonElement.ValueKind == JsonValueKind.Array)
{
writer.WritePropertyName(ItemsPropertyName);
jsonElement.WriteTo(writer);
}
else
{
foreach (var property in jsonElement.EnumerateObject().Where(property => !property.NameEquals(TypePropertyName)))
{
writer.WritePropertyName(property.Name);
property.Value.WriteTo(writer);
}
}
if (type != typeof(ExpandoObject))
{
if (shouldWriteTypeField)
@ -261,20 +275,6 @@ public class PolymorphicObjectConverter(IWellKnownTypeRegistry wellKnownTypeRegi
}
}
if (jsonElement.ValueKind == JsonValueKind.Array)
{
writer.WritePropertyName(ItemsPropertyName);
jsonElement.WriteTo(writer);
}
else
{
foreach (var property in jsonElement.EnumerateObject().Where(property => !property.NameEquals(TypePropertyName)))
{
writer.WritePropertyName(property.Name);
property.Value.WriteTo(writer);
}
}
writer.WriteEndObject();
}