Merge pull request #1896 from bcgov/dev

Dev

Author: JamesPasta

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

@@ -9,11 +9,8 @@ namespace Unity.Flex.Scoresheets
     public class ScoresheetSectionDto : ExtensibleEntityDto<Guid>
     {
         public virtual string Name { get; private set; } = string.Empty;
-        public virtual uint Order { get; private set; }      
-        public virtual Guid ScoresheetId { get; }
-
+        public virtual uint Order { get; private set;} = 0;
+        public virtual Guid ScoresheetId { get; } 
         public virtual Collection<QuestionDto> Fields { get; private set; } = [];
-
-
     }
 }

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/ScoresheetInstances/ScoresheetInstance.cs

@@ -20,7 +20,7 @@ public class ScoresheetInstance : FullAuditedAggregateRoot<Guid>, IMultiTenant,
 
         // Correlation
         public virtual Guid CorrelationId { get; private set; }
-        public virtual string CorrelationProvider { get; private set; } = string.Empty;
+        public virtual string CorrelationProvider { get; private set; }
 
         public Guid? TenantId { get; set; }
 

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/Services/WorksheetsManager.cs

@@ -168,7 +168,7 @@ private async Task<WorksheetInstance> CreateNewWorksheetInstanceAsync(IWorksheet
             var newWorksheetInstances = new List<(Worksheet, WorksheetInstance)>();
 
             // naming convention custom_worksheetname_fieldname
-            foreach (var (fieldName, chefsPropertyName, value) in eventData.CustomFields)
+            foreach (var (fieldName, _, _) in eventData.CustomFields)
             {
                 var split = fieldName.Split('_', StringSplitOptions.RemoveEmptyEntries);
 

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/DataGridServiceUtils.cs

@@ -41,7 +41,7 @@ internal static List<WorksheetFieldViewModel> ExtractCustomColumnsValues(DataGri
                     CurrentValueId = Guid.Empty,
                     Definition = GetDefaultDefinition(column.Type),
                     Enabled = true,
-                    Type = (CustomFieldType)Enum.Parse(typeof(CustomFieldType), column.Type),
+                    Type = Enum.Parse<CustomFieldType>(column.Type),
                     UiAnchor = string.Empty,
                     Order = rowNumber
                 });
@@ -52,7 +52,7 @@ internal static List<WorksheetFieldViewModel> ExtractCustomColumnsValues(DataGri
 
         internal static string GetDefaultDefinition(string type)
         {
-            return DefinitionResolver.Resolve((CustomFieldType)Enum.Parse(typeof(CustomFieldType), type), null);
+            return DefinitionResolver.Resolve(Enum.Parse<CustomFieldType>(type), null);
         }
 
         internal static string? GetCurrentValueAndTransform(DataGridRow? dataRow, DataGridDefinitionColumn column)

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/ScoresheetConfiguration/QuestionModal.cshtml.cs

@@ -22,8 +22,7 @@ public QuestionModalModel(IQuestionAppService questionAppService, IScoresheetApp
     {
         _questionAppService = questionAppService;
         _scoresheetAppService = scoresheetAppService;
-        QuestionTypeOptionsList = Enum.GetValues(typeof(QuestionType))
-                                      .Cast<QuestionType>()
+        QuestionTypeOptionsList = Enum.GetValues<QuestionType>()
                                       .Select(qt => new SelectListItem
                                       {
                                           Value = ((int)qt).ToString(),

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/WorksheetConfiguration/UpsertCustomFieldModal.cshtml.cs

@@ -63,7 +63,7 @@ public async Task OnGetAsync(Guid worksheetId, Guid sectionId, Guid fieldId, str
         WorksheetId = worksheetId;
         SectionId = sectionId;
         FieldTypes = GetAvailableFieldTypes();
-        UpsertAction = (WorksheetUpsertAction)Enum.Parse(typeof(WorksheetUpsertAction), actionType);
+        UpsertAction = Enum.Parse<WorksheetUpsertAction>(actionType);
         FieldType = "Text";
 
         if (UpsertAction == WorksheetUpsertAction.Update)
@@ -118,7 +118,7 @@ private async Task<CustomFieldDto> InsertCustomField()
             Definition = ExtractDefinition(),
             Label = Label!,
             Key = Key!,
-            Type = (CustomFieldType)Enum.Parse(typeof(CustomFieldType), FieldType!)
+            Type = Enum.Parse<CustomFieldType>(FieldType!)
         });
     }
 
@@ -129,7 +129,7 @@ private async Task<CustomFieldDto> UpdateCustomField()
             Definition = ExtractDefinition(),
             Label = Label!,
             Key = Key!,
-            Type = (CustomFieldType)Enum.Parse(typeof(CustomFieldType), FieldType!)
+            Type = Enum.Parse<CustomFieldType>(FieldType!)
         });
     }
 

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/WorksheetConfiguration/UpsertSectionModal.cshtml.cs

@@ -38,7 +38,7 @@ public async Task OnGetAsync(Guid worksheetId, Guid sectionId, string actionType
     {
         WorksheetId = worksheetId;
         SectionId = sectionId;
-        UpsertAction = (WorksheetUpsertAction)Enum.Parse(typeof(WorksheetUpsertAction), actionType);
+        UpsertAction = Enum.Parse<WorksheetUpsertAction>(actionType);
 
         if (UpsertAction == WorksheetUpsertAction.Update)
         {

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/WorksheetConfiguration/UpsertWorksheetModal.cshtml.cs

@@ -32,12 +32,12 @@ public class UpsertWorksheetModalModel(IWorksheetAppService worksheetAppService)
 
     public async Task OnGetAsync(Guid worksheetId, string actionType)
     {
-        UpsertAction = (WorksheetUpsertAction)Enum.Parse(typeof(WorksheetUpsertAction), actionType);
+        UpsertAction = Enum.Parse<WorksheetUpsertAction>(actionType);
 
         if (UpsertAction == WorksheetUpsertAction.Update)
         {
             WorksheetDto worksheetDto = await worksheetAppService.GetAsync(worksheetId);
-            UpsertAction = (WorksheetUpsertAction)Enum.Parse(typeof(WorksheetUpsertAction), actionType);
+            UpsertAction = Enum.Parse<WorksheetUpsertAction>(actionType);
 
             Name = worksheetDto.Name;
             WorksheetId = worksheetDto.Id;

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/BCAddressWidget/Default.css

@@ -1 +1 @@
- 
+/* BC Address Widget Styles - Placeholder file required by the component structure */

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/CurrencyDefinitionWidget/Default.css

@@ -1 +1 @@
- 
+/* Currency Definition Widget Styles - Placeholder file required by the component structure */