Add serialisation compatibility of TimeSpan and DateTime

src/OrchardCore/OrchardCore.Abstractions/Json/JOptions.cs

@@ -36,6 +36,8 @@ static JOptions()
         Default = new JsonSerializerOptions(Base);
         Default.Converters.Add(new DynamicJsonConverter());
         Default.Converters.Add(new PathStringJsonConverter());
+        Default.Converters.Add(new TimeSpanJsonConverter());
+        Default.Converters.Add(new DateTimeJsonConverter());
 
         Indented = new JsonSerializerOptions(Default)
         {

src/OrchardCore/OrchardCore.Abstractions/Json/Serialization/DateTimeJsonConverter.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OrchardCore.Json.Serialization;
+public class DateTimeJsonConverter : JsonConverter<DateTime>
+{
+    // ISO 8601 format with milliseconds and time zone
+    private const string DateTimeFormat = "yyyy-MM-ddTHH:mm:ss.fffK"; 
+
+    public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.String)
+        {
+            throw new JsonException($"Unexpected token parsing DateTime. Expected a string, got {reader.TokenType}.");
+        }
+
+        var stringValue = reader.GetString();
+        if (DateTime.TryParse(stringValue, null, DateTimeStyles.RoundtripKind, out var dateTime))
+        {
+            return dateTime;
+        }
+
+        throw new JsonException($"Unable to convert \"{stringValue}\" to DateTime.");
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString(DateTimeFormat, CultureInfo.InvariantCulture));
+    }
+}

src/OrchardCore/OrchardCore.Abstractions/Json/Serialization/TimeSpanJsonConverter.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OrchardCore.Json.Serialization
+{
+    public class TimeSpanJsonConverter : JsonConverter<TimeSpan>
+    {
+        public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType != JsonTokenType.String)
+            {
+                throw new JsonException($"Unexpected token parsing TimeSpan. Expected a string, got {reader.TokenType}.");
+            }
+
+            var stringValue = reader.GetString();
+            if (TimeSpan.TryParse(stringValue, out var timeSpan))
+            {
+                return timeSpan;
+            }
+
+            throw new JsonException($"Unable to convert \"{stringValue}\" to TimeSpan.");
+        }
+
+        public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value.ToString());
+        }
+    }
+}

test/OrchardCore.Tests/Data/ContentItemTests.cs

@@ -1,12 +1,41 @@
 using System.Text.Json;
 using System.Text.Json.Dynamic;
 using System.Text.Json.Nodes;
+using OrchardCore.ContentFields.Fields;
 using OrchardCore.ContentManagement;
 
 namespace OrchardCore.Tests.Data
 {
     public class ContentItemTests
     {
+        [Fact]
+        public void TimeFieldTests()
+        {
+            var jsonStr = """
+             {
+                "TimeFieldTest": {
+                    "Value": "13:05"
+                },
+                "DateTimeFieldTest": {
+                    "Value": "2024-5-31 13:05"
+                },
+                "DateFieldTest": {
+                    "Value": "2024-5-31"
+                }
+            }
+            """;
+            var jobject = JsonNode.Parse(jsonStr);
+
+            var timeField = jobject.SelectNode("TimeFieldTest").ToObject<TimeField>();
+            Assert.Equal("13:05:00", timeField.Value.Value.ToString());
+
+            var dateField = jobject.SelectNode("DateFieldTest").ToObject<DateField>();
+            Assert.Equal("2024-05-31", dateField.Value.Value.ToString("yyyy-MM-dd"));
+
+            var dateTimeField = jobject.SelectNode("DateTimeFieldTest").ToObject<DateTimeField>();
+            Assert.Equal("2024-05-31 13:05", dateTimeField.Value.Value.ToString("yyyy-MM-dd HH:mm"));
+        }
+
         [Fact]
         public void ShouldSerializeContent()
         {