Refactoring

Refacotring

Author: joey-orbyss

src/ComponentInstances/DateInputFormComponentInstance.cs

@@ -0,0 +1,25 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Orbyss.Blazor.JsonForms.ComponentInstances
+{
+    public class DateOnlyInputFormComponentInstance(Type componentGenericTypeDefinition) : DateOnlyInputFormComponentInstanceBase<DateOnly?>
+    {
+        public override Type ComponentType => componentGenericTypeDefinition.MakeGenericType(typeof(DateOnly?));
+
+        protected override sealed Func<DateTime?, DateOnly?>? ConvertFromDateTime => dt => dt.HasValue ? new DateOnly(dt.Value.Year, dt.Value.Month, dt.Value.Day) : null;
+
+        protected override sealed Func<DateOnly?, DateTime?>? ConvertToDateTime => dt => dt.HasValue ? dt.Value.ToDateTime(TimeOnly.MinValue) : null;
+
+        protected override sealed object? ConvertValue(JToken? token)
+        {
+            return DateOnly.TryParse($"{token}", Culture, out var date)
+                ? date
+                : null;
+        }
+    }
+}

src/ComponentInstances/DateOnlyInputFormComponentInstance.cs

@@ -0,0 +1,33 @@
+namespace Orbyss.Blazor.JsonForms.ComponentInstances
+{
+    public abstract class DateOnlyInputFormComponentInstanceBase<TDate> : InputFormComponentInstanceBase
+    {
+        protected abstract Func<DateTime?, TDate>? ConvertFromDateTime { get; }
+
+        protected abstract Func<TDate, DateTime?>? ConvertToDateTime { get; }
+
+        public DateTime? MinimumDate { get; set; }
+
+        public DateTime? MaximumDate { get; set; }
+
+        public bool AllowManualInput { get; set; }
+
+        protected override sealed IDictionary<string, object?> GetFormInputParameters()
+        {
+            var result = GetDateInputParameter();
+
+            result[nameof(ConvertFromDateTime)] = ConvertFromDateTime;
+            result[nameof(ConvertToDateTime)] = ConvertToDateTime;
+            result[nameof(MinimumDate)] = MinimumDate;
+            result[nameof(MaximumDate)] = MaximumDate;
+            result[nameof(AllowManualInput)] = AllowManualInput;
+
+            return result;
+        }
+
+        protected virtual IDictionary<string, object?> GetDateInputParameter()
+        {
+            return new Dictionary<string, object?>();
+        }
+    }
+}

src/ComponentInstances/DateOnlyInputFormComponentInstanceBase.cs

@@ -0,0 +1,24 @@
+using Newtonsoft.Json.Linq;
+using Orbyss.Components.Json.Models;
+
+namespace Orbyss.Blazor.JsonForms.ComponentInstances
+{
+    public class DateOnlyUtcTicksInputFormComponentInstance(Type componentGenericTypeDefinition) : DateOnlyInputFormComponentInstanceBase<DateUtcTicks?>
+    {
+        public override Type ComponentType => componentGenericTypeDefinition.MakeGenericType(typeof(DateUtcTicks?));
+
+        protected override sealed Func<DateTime?, DateUtcTicks?>? ConvertFromDateTime => dt => dt.HasValue ? new DateUtcTicks(dt.Value.Ticks) : null;
+
+        protected override sealed Func<DateUtcTicks?, DateTime?>? ConvertToDateTime => dt => dt.HasValue ? dt.Value.DateOnly.ToDateTime(TimeOnly.MinValue) : null;
+
+        protected override sealed object? ConvertValue(JToken? token)
+        {
+            if (token is null || string.IsNullOrWhiteSpace($"{token}"))
+            {
+                return null;
+            }
+
+            return new DateUtcTicks((long)token);
+        }
+    }
+}

src/ComponentInstances/DateOnlyUtcTicksInputFormComponentInstance.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json.Linq;
+
+namespace Orbyss.Blazor.JsonForms.ComponentInstances
+{
+    public class DateTimeInputFormComponentInstance(Type componentGenericTypeDefinition) : DateTimeInputFormComponentInstanceBase<DateTime?>
+    {
+        public override Type ComponentType => componentGenericTypeDefinition.MakeGenericType(typeof(DateTime?));
+
+        protected override sealed Func<DateTime?, DateTime?>? ConvertFromDateTime => (dt) => dt;
+
+        protected override sealed Func<DateTime?, DateTime?>? ConvertToDateTime => (dt) => dt;
+
+        protected override sealed object? ConvertValue(JToken? token)
+        {
+            return DateTime.TryParse($"{token}", Culture, out var dateTime)
+                ? dateTime
+                : null;
+        }
+    }     
+}

src/ComponentInstances/DateTimeInputFormComponentInstance.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Orbyss.Blazor.JsonForms.ComponentInstances
+{
+    public abstract class DateTimeInputFormComponentInstanceBase<TDate> : DateOnlyInputFormComponentInstanceBase<TDate>
+    {
+        public DateTime? MinimumTime { get; set; }
+
+        public DateTime? MaximumTime { get; set; }
+
+        public int? TimeStep { get; set; }
+
+        protected sealed override IDictionary<string, object?> GetDateInputParameter()
+        {
+            var result = GetDateTimeInputParameter();
+
+            result[nameof(MinimumTime)] = MinimumTime;
+            result[nameof(MaximumTime)] = MaximumTime;
+            result[nameof(TimeStep)] = TimeStep;
+
+            return result;
+        }
+
+        protected virtual IDictionary<string, object?> GetDateTimeInputParameter()
+        {
+            return new Dictionary<string, object?>();
+        }
+    }
+}

src/ComponentInstances/DateTimeInputFormComponentInstanceBase.cs

@@ -0,0 +1,25 @@
+using Newtonsoft.Json.Linq;
+using Orbyss.Components.Json.Models;
+
+namespace Orbyss.Blazor.JsonForms.ComponentInstances
+{
+
+    public class DateTimeUtcTicksInputFormComponentInstance(Type componentGenericTypeDefinition) : DateTimeInputFormComponentInstanceBase<DateTimeUtcTicks?>
+    {
+        public override Type ComponentType => componentGenericTypeDefinition.MakeGenericType(typeof(DateTimeUtcTicks?));
+
+        protected override sealed Func<DateTime?, DateTimeUtcTicks?>? ConvertFromDateTime => dt => dt.HasValue ? new DateTimeUtcTicks(dt.Value.Ticks) : null;
+
+        protected override sealed Func<DateTimeUtcTicks?, DateTime?>? ConvertToDateTime => dt => dt.HasValue ? dt.Value.DateTime.DateTime : null;
+
+        protected override sealed object? ConvertValue(JToken? token)
+        {
+            if (token is null || string.IsNullOrWhiteSpace($"{token}"))
+            {
+                return null;
+            }
+
+            return new DateTimeUtcTicks((long)token);
+        }
+    }
+}

src/ComponentInstances/DateTimeUtcTicksInputFormComponentInstance.cs

@@ -11,7 +11,7 @@ public ControlType Interpret(JSchema jsonSchema, string absoluteJsonSchemaPath,
         {
             var jsonSchemaToken = JToken.Parse($"{jsonSchema}");
             var schemaToken = jsonSchemaToken?.SelectToken(absoluteJsonSchemaPath, false)
-                ?? throw new InvalidSchemaTypeConfigurationException("Data schema is null");
+                ?? throw new InvalidSchemaTypeConfigurationException($"Data schema section for json schema path '{absoluteJsonSchemaPath}' cannot be found");
 
             var parentSchemaToken = !string.IsNullOrWhiteSpace(absoluteParentSchemaJsonPath)
                 ? jsonSchemaToken?.SelectToken(absoluteParentSchemaJsonPath, false)

src/Interpretation/ControlTypeInterpreter.cs

@@ -30,12 +30,10 @@
 		<RepositoryType>git</RepositoryType>
 		<PackageIcon>icon.png</PackageIcon>
 
-		<ReleaseNotes>
-			Fixed some major bugs that existed due to major refactoring and first preview revision release.
-			1. Fixed a bug where the form would not render correctly if the schema was not valid.
-			2. Fixed bug of OnValueChanged parameter that was not passed to dropdowns
-			3. Translation context issues: now takes the default translation if the context is not configured with an active language
-		</ReleaseNotes>
+		<PackageReleaseNotes>
+			- Reorganized the Date/Time form component instances. 
+			- Added clearer exception handling in ControlTypeInterpreter
+		</PackageReleaseNotes>
 	</PropertyGroup>
 
 	<ItemGroup>