Skip to content

Update the existing date/time property editor to provide a kind of unspecified #19727

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
merged 2 commits into from
Jul 22, 2025
Merged

Update the existing date/time property editor to provide a kind of unspecified #19727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c6d1a
Update the existing date/time property editor to provide a Kind of Un…
lauraneto Jul 14, 2025
e661b90
Added unit tests
lauraneto Jul 21, 2025
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
13 changes: 5 additions & 8 deletions src/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,16 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub

internal static DateTime ParseDateTimeValue(object? source)
{
if (source is null)
if (source is DateTime dateTimeValue)
{
return DateTime.MinValue;
return DateTime.SpecifyKind(dateTimeValue, DateTimeKind.Unspecified);
}

if (source is DateTime dateTimeValue)
if (source.TryConvertTo<DateTime>() is { Success: true } attempt)
{
return dateTimeValue;
return DateTime.SpecifyKind(attempt.Result, DateTimeKind.Unspecified);
}

Attempt<DateTime> attempt = source.TryConvertTo<DateTime>();
return attempt.Success
? attempt.Result
: DateTime.MinValue;
return DateTime.MinValue;
}
}
25 changes: 25 additions & 0 deletions ...s.UnitTests/Umbraco.Core/PropertyEditors/ValueConverters/DatePickerValueConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using NUnit.Framework;
using Umbraco.Cms.Core.PropertyEditors.ValueConverters;

namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors.ValueConverters;

[TestFixture]
public class DatePickerValueConverterTests
{
private static object[] _parseDateTimeValueCases =
[
new object[] { null, DateTime.MinValue },
new object[] { DateTime.MinValue, DateTime.MinValue },
new object[] { new DateTime(2021, 01, 20, 9, 0, 36), new DateTime(2021, 01, 20, 9, 0, 36) },
new object[] { "2021-01-20T09:00:36", new DateTime(2021, 01, 20, 9, 0, 36) },
new object[] { "test", DateTime.MinValue },
];

[TestCaseSource(nameof(_parseDateTimeValueCases))]
public void Can_Parse_DateTime_Value(object? input, DateTime expected)
{
var result = DatePickerValueConverter.ParseDateTimeValue(input);
Assert.AreEqual(expected, result);
Assert.AreEqual(DateTimeKind.Unspecified, result.Kind);
}
}