Merge pull request #1959 from bcgov/test

Test

Author: DarylTodosichuk

.gitignore

@@ -115,4 +115,5 @@ appsettings.json
 /applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.secrets.json
 
 /applications/Orchestrator
-*.env
+*.env
+/applications/Unity.GrantManager/src/Unity.GrantManager.Web/package-lock.json

applications/Unity.AutoUI/package-lock.json

@@ -0,0 +1,17 @@
+<Project>
+  
+  <PropertyGroup>
+    <!-- Suppress NU1701 warnings for Microsoft.Extensions.Compliance.Abstractions -->
+    <!-- This package works correctly with .NET 9.0 despite targeting older frameworks -->
+    <!-- Suppress MSB3277 warnings for EntityFrameworkCore.Relational version conflicts -->
+    <!-- These conflicts don't cause runtime issues in this solution -->
+    <NoWarn>$(NoWarn);NU1701;MSB3277</NoWarn>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <!-- Explicitly reference compatible version to avoid transitive dependency warnings -->
+    <PackageReference Include="Microsoft.Extensions.Compliance.Abstractions" Version="9.5.0" />
+
+  </ItemGroup>
+  
+</Project>

applications/Unity.GrantManager/Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <Version>1.0.0</Version>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;MSB3277</NoWarn>
 	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>
 

applications/Unity.GrantManager/common.props

@@ -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.Contracts/Scoresheets/ScoresheetSectionDto.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/ScoresheetInstances/ScoresheetInstance.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.Application/Domain/Services/WorksheetsManager.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/Components/DataGrid/DataGridServiceUtils.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/ScoresheetConfiguration/QuestionModal.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!)
         });
     }