Revert "Test"

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/QuestionDto.cs

@@ -22,74 +22,22 @@ public class QuestionDto : ExtensibleEntityDto<Guid>
 
         public string? GetMin()
         {
-            try
-            {
-                var def = JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}");
-                if (def?.Min == null)
-                    return null;
-                // Only allow Int64 values
-                if (long.TryParse(def.Min.ToString(), out var minValue))
-                    return minValue.ToString();
-                return null;
-            }
-            catch
-            {
-                return null;
-            }
+            return JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}")?.Min.ToString();
         }
 
         public string? GetMax()
         {
-            try
-            {
-                var def = JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}");
-                if (def?.Max == null)
-                    return null;
-                // Only allow Int64 values
-                if (long.TryParse(def.Max.ToString(), out var maxValue))
-                    return maxValue.ToString();
-                return null;
-            }
-            catch
-            {
-                return null;
-            }
+            return JsonSerializer.Deserialize<NumericDefinition>(Definition ?? "{}")?.Max.ToString();
         }
 
         public string? GetMinLength()
         {
-            try
-            {
-                var def = JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}");
-                if (def?.MinLength == null)
-                    return null;
-                // Only allow Int64 values
-                if (long.TryParse(def.MinLength.ToString(), out var minLength))
-                    return minLength.ToString();
-                return null;
-            }
-            catch
-            {
-                return null;
-            }
+            return JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}")?.MinLength.ToString();
         }
 
         public string? GetMaxLength()
         {
-            try
-            {
-                var def = JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}");
-                if (def?.MaxLength == null)
-                    return null;
-                // Only allow Int64 values
-                if (long.TryParse(def.MaxLength.ToString(), out var maxLength))
-                    return maxLength.ToString();
-                return null;
-            }
-            catch
-            {
-                return null;
-            }
+            return JsonSerializer.Deserialize<TextDefinition>(Definition ?? "{}")?.MaxLength.ToString();
         }
 
         public string? GetYesValue()

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/FlexTypeExtensions.cs

@@ -57,27 +57,15 @@ public static string ConvertInputType(this CustomFieldType type)
 
         public static CustomFieldDefinition? ConvertDefinition(this string definition, QuestionType type)
         {
-            if (string.IsNullOrWhiteSpace(definition))
-            {
-                return null;
-            }
-
-            try
-            {
-                return type switch
-                {
-                    QuestionType.Text => JsonSerializer.Deserialize<TextDefinition>(definition),
-                    QuestionType.Number => JsonSerializer.Deserialize<NumericDefinition>(definition),
-                    QuestionType.YesNo => JsonSerializer.Deserialize<QuestionYesNoDefinition>(definition),
-                    QuestionType.SelectList => JsonSerializer.Deserialize<QuestionSelectListDefinition>(definition),
-                    QuestionType.TextArea => JsonSerializer.Deserialize<TextAreaDefinition>(definition),
-                    _ => null,
-                };
-            }
-            catch (JsonException)
+            return type switch
             {
-                return null;
-            }
+                QuestionType.Text => JsonSerializer.Deserialize<TextDefinition>(definition),
+                QuestionType.Number => JsonSerializer.Deserialize<NumericDefinition>(definition),
+                QuestionType.YesNo => JsonSerializer.Deserialize<QuestionYesNoDefinition>(definition),
+                QuestionType.SelectList => JsonSerializer.Deserialize<QuestionSelectListDefinition>(definition),
+                QuestionType.TextArea => JsonSerializer.Deserialize<TextAreaDefinition>(definition),
+                _ => null,
+            };
         }
 
         public static string[] GetCheckedOptions(this string value)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/NumericDefinitionWidget/NumericDefinitionWidget.cs

@@ -29,36 +29,23 @@ public class NumericDefinitionWidget : AbpViewComponent
             .ApplyRequired(form);
         }
 
-        // Cache JsonSerializerOptions instance
-        private static readonly JsonSerializerOptions CachedJsonOptions = new JsonSerializerOptions
-        {
-            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString
-        };
-
         public async Task<IViewComponentResult> InvokeAsync(string? definition)
         {
-            NumericDefinitionViewModel viewModel = new();
-
-            if (!string.IsNullOrWhiteSpace(definition))
+            if (definition != null)
             {
-                try
+                NumericDefinition? numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition);
+                if (numericDefinition != null)
                 {
-                    var numericDefinition = JsonSerializer.Deserialize<NumericDefinition>(definition, CachedJsonOptions);
-
-                    if (numericDefinition != null)
+                    return View(await Task.FromResult(new NumericDefinitionViewModel()
                     {
-                        viewModel.Min = numericDefinition.Min;
-                        viewModel.Max = numericDefinition.Max;
-                        viewModel.Required = numericDefinition.Required;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Optionally log the error                    
+                        Min = numericDefinition.Min,
+                        Max = numericDefinition.Max,
+                        Required = numericDefinition.Required
+                    }));
                 }
             }
 
-            return View(await Task.FromResult(viewModel));
+            return View(await Task.FromResult(new NumericDefinitionViewModel()));
         }
     }
 

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Application.Contracts/Emails/EmailHistoryDto.cs

@@ -10,8 +10,6 @@ public class EmailHistoryDto : ExtensibleAuditedEntityDto<Guid>
     public string Status { get; set; } = string.Empty;
     public string FromAddress { get; set; } = string.Empty;
     public string ToAddress { get; set; } = string.Empty;
-    public string Cc { get; set; } = string.Empty;
-    public string Bcc { get; set; } = string.Empty;
     public DateTime? SentDateTime { get; set; }
     public string Body { get; set; } = string.Empty;
     public EmailHistoryUserDto? SentBy { get; set; }