From aeddbbbc4af24896a36dec0b97826eec2bd2c5d1 Mon Sep 17 00:00:00 2001 From: JamesPasta Date: Tue, 23 Jun 2026 08:40:49 -0700 Subject: [PATCH 1/3] feature/AB#24674-ScheduledEmails-SonarRefactors-CodeQL --- .../Views/Shared/Components/EmailsWidget/Default.css | 1 - 1 file changed, 1 deletion(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css index 0fc4056f6..97b953a8a 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css @@ -131,7 +131,6 @@ width: 100%; height: 36px; padding: 6px 8px !important; - display: inline-block; position: relative; flex-grow: 1; padding-right: 75px !important; From 96bcb34e305996cd0d534a75b9ff4d17a28ceb95 Mon Sep 17 00:00:00 2001 From: JamesPasta Date: Tue, 23 Jun 2026 09:50:55 -0700 Subject: [PATCH 2/3] feature/AB#24674-ScheduledEmails-SonarRefactors-CodeQL --- .../Settings/GrantManagerSettingDefinitionProvider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs index 1015a02f9..9eb1d5451 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Settings/GrantManagerSettingDefinitionProvider.cs @@ -68,8 +68,8 @@ private static void AddBackgroundJobSettingDefinition(ISettingDefinitionContext { SettingsConstants.BackgroundJobs.DataHealthCheckMonitor_Expression, "0 0 * 1/1 * ? *" }, // 2 AM PST = 10 AM UTC { SettingsConstants.BackgroundJobs.ApplicantTenantMapReconciliation_Expression, "0 0 10 1/1 * ? *" }, - // 2 AM UTC = Date-based scheduled notifications check - { SettingsConstants.BackgroundJobs.DateBasedNotificationSchedule_Expression, "0 */10 * * * ?" } //"0 0 2 1/1 * ? *" + // 2 AM PST = 10 AM UTC + { SettingsConstants.BackgroundJobs.DateBasedNotificationSchedule_Expression, "0 0 10 1/1 * ? *" } }; foreach (var setting in backGroundSchedules) From 96ecf07cb342637a4f8d21e61593049b80a65a96 Mon Sep 17 00:00:00 2001 From: JamesPasta Date: Tue, 23 Jun 2026 15:33:47 -0700 Subject: [PATCH 3/3] feature/AB#24674-ScheduledEmails-PermissionFixes --- .../Components/EmailsWidget/Default.cshtml | 3 +- .../Shared/Components/EmailsWidget/Default.js | 56 +++++++++---------- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml index 6e26ef6a7..cbb04e1c0 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml @@ -15,7 +15,6 @@ var enableEmailDelay = Model.EnableEmailDelay; var scheduleEmailGranted = await PermissionChecker.IsGrantedAsync("Notifications.Email.Schedule"); var enableScheduleSend = enableEmailDelay && scheduleEmailGranted; - }
@@ -95,7 +94,7 @@ Send -
    diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js index 1b2ff71b8..f60c1fd0f 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js @@ -240,7 +240,32 @@ editor?.mode.set('design'); } - + function validateScheduleDate() { + const dateStr = UIElements.scheduleDateInput.val(); + // Clear any previous validation messages and error toasts + UIElements.scheduleDateValidation.removeClass('text-success').removeClass('text-danger').text('').hide(); + + if (dateStr?.length === 10) { + const [month, day, year] = dateStr.split('/').map(Number); + if (isValidDate(month, day, year)) { + scheduleState.selectedDate = new Date(year, month - 1, day); + scheduleState.currentMonth = month - 1; + scheduleState.currentYear = year; + renderCalendarGrid(scheduleState); + UIElements.scheduleDateValidation.text('✓ Valid date').removeClass('text-danger').addClass('text-success').show(); + } else { + const errorMsg = '✗ Invalid date'; + UIElements.scheduleDateValidation.text(errorMsg).removeClass('text-success').addClass('text-danger').show(); + showValidationErrorToast([errorMsg]); + } + } else if (dateStr) { + const errorMsg = '✗ Invalid date format (use MM/DD/YYYY)'; + UIElements.scheduleDateValidation.text(errorMsg).removeClass('text-success').addClass('text-danger').show(); + showValidationErrorToast([errorMsg]); + } else { + UIElements.scheduleDateValidation.hide(); + } + } function bindDelayModeEvents() { // Use global scheduleState @@ -307,34 +332,7 @@ UIElements.scheduleDateValidation.hide(); } }); - - function validateScheduleDate() { - const dateStr = UIElements.scheduleDateInput.val(); - // Clear any previous validation messages and error toasts - UIElements.scheduleDateValidation.removeClass('text-success').removeClass('text-danger').text('').hide(); - - if (dateStr?.length === 10) { - const [month, day, year] = dateStr.split('/').map(Number); - if (isValidDate(month, day, year)) { - scheduleState.selectedDate = new Date(year, month - 1, day); - scheduleState.currentMonth = month - 1; - scheduleState.currentYear = year; - renderCalendarGrid(scheduleState); - UIElements.scheduleDateValidation.text('✓ Valid date').removeClass('text-danger').addClass('text-success').show(); - } else { - const errorMsg = '✗ Invalid date'; - UIElements.scheduleDateValidation.text(errorMsg).removeClass('text-success').addClass('text-danger').show(); - showValidationErrorToast([errorMsg]); - } - } else if (dateStr) { - const errorMsg = '✗ Invalid date format (use MM/DD/YYYY)'; - UIElements.scheduleDateValidation.text(errorMsg).removeClass('text-success').addClass('text-danger').show(); - showValidationErrorToast([errorMsg]); - } else { - UIElements.scheduleDateValidation.hide(); - } - } - + UIElements.scheduleDateInput.on('blur', function () { validateScheduleDate(); });