From 9a2225d281bef5972862c2ff51882181c3f3890d Mon Sep 17 00:00:00 2001 From: James Pasta <129337673+JamesPasta@users.noreply.github.com> Date: Thu, 30 Apr 2026 09:50:43 -0700 Subject: [PATCH 1/2] Revert "feature/AB#32815-FixBuildWarnings" --- .../Common/KeyValueComponentDefinition.cs | 15 +++++++----- .../Configuration/ReportMappingUtils.cs | 24 +++++++++---------- .../UX2/Components/Topbar/Default.cshtml | 1 + .../Applicants/IApplicantAppService.cs | 1 + .../Assessments/AssessmentAppService.cs | 1 + 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs index 1f0c7cf0a2..8d27f7a3cc 100644 --- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs +++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs @@ -30,14 +30,17 @@ protected enum KeyValueType protected static void ValidateKeysFormat(StringValues keys) { - foreach (var key in keys.Where(k => string.IsNullOrWhiteSpace(k))) + foreach (var key in keys) { - throw new UserFriendlyException("There are empty Keys captured which are required"); - } + if (string.IsNullOrWhiteSpace(key)) + { + throw new UserFriendlyException("There are empty Keys captured which are required"); + } - foreach (var key in keys.Where(k => !string.IsNullOrWhiteSpace(k) && !IsValidInput(k))) - { - throw new UserFriendlyException("The following characters are allowed for Keys: " + validInputPattern); + if (!IsValidInput(key)) + { + throw new UserFriendlyException("The following characters are allowed for Keys: " + validInputPattern); + } } } diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs index 878dd022dd..169350689f 100644 --- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs +++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs @@ -316,18 +316,18 @@ internal static ReportColumnsMap CreateNewMap(UpsertReportColumnsMapDto upsertRe // Generate column names for fields without user-provided mappings // For formversion provider, use Key (CHEFS Property Name) as the source; for others, use Label - var autoGeneratedColumnNames = fieldsMap.Fields - .Where(field => !userProvidedMappings.ContainsKey(field.Path)) - .ToDictionary( - field => field.Path, - field => { - var columnNameSource = GetDefaultColumnNameSource(field, upsertReportColmnsMapDto.CorrelationProvider); - var sanitizedName = SanitizeColumnName(columnNameSource); - var uniqueName = EnsureUniqueness(sanitizedName, usedColumnNames); - usedColumnNames.Add(uniqueName); - return uniqueName; - } - ); + var autoGeneratedColumnNames = new Dictionary(); + foreach (var field in fieldsMap.Fields) + { + if (!userProvidedMappings.ContainsKey(field.Path)) + { + var columnNameSource = GetDefaultColumnNameSource(field, upsertReportColmnsMapDto.CorrelationProvider); + var sanitizedName = SanitizeColumnName(columnNameSource); + var uniqueName = EnsureUniqueness(sanitizedName, usedColumnNames); + autoGeneratedColumnNames[field.Path] = uniqueName; + usedColumnNames.Add(uniqueName); + } + } // Create mapping rows var mapRows = fieldsMap.Fields.Select(field => diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml index e9cc126ee8..29f143e884 100644 --- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml +++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml @@ -33,6 +33,7 @@ if (CurrentUser.IsAuthenticated && CurrentUser.FindClaimValue("has_multiple_tenants") == "true") isAuthorizedForTenantSwitch = true; + bool isAuthorizedForPaymentConfiguration = await PermissionChecker.IsGrantedAsync("SettingManagement.ConfigurePayments"); } diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs index 5bd565e22d..700c775081 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text.Json; using System.Threading.Tasks; +using Unity.GrantManager.Applications; using Unity.GrantManager.GrantApplications; using Unity.GrantManager.Intakes; using Unity.Modules.Shared; diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs index 3d5f32fffc..09d14f365a 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs @@ -11,6 +11,7 @@ using Unity.Flex.Scoresheets.Enums; using Unity.Flex.Scoresheets.Events; using Unity.Flex.Worksheets.Definitions; +using Unity.GrantManager.Applications; using Unity.GrantManager.Comments; using Unity.GrantManager.Exceptions; using Unity.GrantManager.Workflow; From 1c5def2b79285bf596be65f56fd486133bc8c383 Mon Sep 17 00:00:00 2001 From: JamesPasta Date: Thu, 30 Apr 2026 11:30:18 -0700 Subject: [PATCH 2/2] bugfix/AB#32825-SupplierAddress --- .../Integrations/Cas/SupplierService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/SupplierService.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/SupplierService.cs index 761ee71632..23147665c9 100644 --- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/SupplierService.cs +++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/Cas/SupplierService.cs @@ -188,7 +188,7 @@ public static SiteEto GetSiteEto(JsonElement site) SupplierSiteCode = GetJsonProperty("suppliersitecode", site), AddressLine1 = GetJsonProperty("addressline1", site), AddressLine2 = GetJsonProperty("addressline2", site), - AddressLine3 = GetJsonProperty("addressline2", site), + AddressLine3 = GetJsonProperty("addressline3", site), City = GetJsonProperty("city", site), Province = GetJsonProperty("province", site), Country = GetJsonProperty("country", site),