From 2c0942f8240857e6c9879c69dd6ed2b6aa6be503 Mon Sep 17 00:00:00 2001 From: Patrick <135162612+plavoie-BC@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:18:57 -0700 Subject: [PATCH 1/6] [AB#32197] Implement RedStop restriction for application actions --- .../IGrantApplicationAppService.cs | 36 +++++++++---------- .../GrantApplicationAppService.cs | 21 +++++++++-- .../Localization/GrantManager/en.json | 1 + .../ApplicationActionWidget.cs | 3 +- .../ApplicationActionWidgetViewModel.cs | 1 + .../ApplicationActionWidget/Default.cshtml | 11 ++++-- .../ApplicationActionWidget/Default.js | 22 +++++++++--- 7 files changed, 65 insertions(+), 30 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs index 234cc5e79d..af8c69ea17 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs @@ -4,23 +4,23 @@ using Unity.Modules.Shared; using Volo.Abp.Application.Dtos; -namespace Unity.GrantManager.GrantApplications +namespace Unity.GrantManager.GrantApplications; + +public interface IGrantApplicationAppService { - public interface IGrantApplicationAppService - { - Task GetApplicationStatusAsync(Guid id); - Task> GetActions(Guid applicationId, bool includeInternal = false); - Task UpdateProjectInfoAsync(Guid id, CreateUpdateProjectInfoDto input); - Task UpdatePartialProjectInfoAsync(Guid id, PartialUpdateDto input); - Task UpdateAssessmentResultsAsync(Guid id, CreateUpdateAssessmentResultsDto input); - Task UpdateSupplierNumberAsync(Guid applicationId, string supplierNumber); - Task> GetAllApplicationsAsync(); - Task> GetApplicationDetailsListAsync(List applicationIds); - Task GetAsync(Guid id); - Task TriggerAction(Guid applicationId, GrantApplicationAction triggerAction); - Task GetAccountCodingIdFromFormIdAsync(Guid formId); - Task HideAIAnalysisItemAsync(Guid applicationId, string itemId); - Task ShowAIAnalysisItemAsync(Guid applicationId, string itemId); - Task> GetListAsync(GrantApplicationListInputDto input); - } + Task GetApplicationStatusAsync(Guid id); + Task> GetActions(Guid applicationId, bool includeInternal = false); + Task UpdateProjectInfoAsync(Guid id, CreateUpdateProjectInfoDto input); + Task UpdatePartialProjectInfoAsync(Guid id, PartialUpdateDto input); + Task UpdateAssessmentResultsAsync(Guid id, CreateUpdateAssessmentResultsDto input); + Task UpdateSupplierNumberAsync(Guid applicationId, string supplierNumber); + Task> GetAllApplicationsAsync(); + Task> GetApplicationDetailsListAsync(List applicationIds); + Task GetAsync(Guid id); + Task TriggerAction(Guid applicationId, GrantApplicationAction triggerAction); + Task GetAccountCodingIdFromFormIdAsync(Guid formId); + Task HideAIAnalysisItemAsync(Guid applicationId, string itemId); + Task ShowAIAnalysisItemAsync(Guid applicationId, string itemId); + Task> GetListAsync(GrantApplicationListInputDto input); + Task IsApplicantRedStop(Guid applicationId); } diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs index 29d8c8bdf6..88511f4029 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs @@ -14,11 +14,11 @@ using System.Threading.Tasks; using Unity.Flex.WorksheetInstances; using Unity.Flex.Worksheets; +using Unity.GrantManager.AI.Models; +using Unity.GrantManager.AI.Responses; using Unity.GrantManager.Applicants; using Unity.GrantManager.ApplicationForms; using Unity.GrantManager.Applications; -using Unity.GrantManager.AI.Models; -using Unity.GrantManager.AI.Responses; using Unity.GrantManager.Events; using Unity.GrantManager.Flex; using Unity.GrantManager.Identity; @@ -955,6 +955,14 @@ public async Task GetApplicationStatusAsync(Guid id) return form.AccountCodingId; } + public async Task IsApplicantRedStop(Guid applicationId) + { + var application = await applicationRepository.GetAsync(applicationId, true) + ?? throw new EntityNotFoundException($"Application with ID {applicationId} not found."); + var applicant = await applicantRepository.GetAsync(application.ApplicantId); + return applicant.RedStop == true; + } + #region APPLICATION WORKFLOW /// /// Fetches the list of actions and their status context for a given application. @@ -974,9 +982,10 @@ public async Task> GetActions(Guid applicati // NOTE: Authorization is applied on the AppService layer and is false by default // AUTHORIZATION HANDLING + bool isRedStop = await IsApplicantRedStop(applicationId); foreach (var item in actionDtos) { - item.IsPermitted = item.IsPermitted && (await AuthorizationService.IsGrantedAsync(application, GetActionAuthorizationRequirement(item.ApplicationAction))); + item.IsPermitted = !isRedStop && item.IsPermitted && (await AuthorizationService.IsGrantedAsync(application, GetActionAuthorizationRequirement(item.ApplicationAction))); item.IsAuthorized = true; } @@ -1002,6 +1011,12 @@ public async Task TriggerAction(Guid applicationId, GrantAp throw new UnauthorizedAccessException(); } + // RED STOP CHECK: Block all status actions when the applicant has RedStop = true + if (await IsApplicantRedStop(applicationId)) + { + throw new UserFriendlyException(L["GrantApplication:ActionButton.RedStopWarning"]); + } + application = await applicationManager.TriggerAction(applicationId, triggerAction); await LocalEventBus.PublishAsync( diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json index 00e7708474..4b3ee78d49 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json @@ -269,6 +269,7 @@ "AssessmentResultsView:AssessmentResultsForm.RiskRanking": "Risk Ranking", "GrantApplication:ActionButtonName": "Status Actions", + "GrantApplication:ActionButton.RedStopWarning": "This application is flagged as high risk. Status actions are not permitted at this time.", "Enum:GrantApplicationAction.Open": "Open", "Enum:GrantApplicationAction.Submit": "Submit", "Enum:GrantApplicationAction.Internal_Assign": "Assign", diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs index a2371e9cff..0d95c298ec 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs @@ -28,7 +28,8 @@ public async Task InvokeAsync(Guid applicationId) var viewModel = new ApplicationActionWidgetViewModel() { ApplicationId = applicationId, - ApplicationActions = await _applicationAppService.GetActions(applicationId) + ApplicationActions = await _applicationAppService.GetActions(applicationId), + IsRedStop = await _applicationAppService.IsApplicantRedStop(applicationId) }; return View(viewModel); diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidgetViewModel.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidgetViewModel.cs index c417c1b4af..8d324382dd 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidgetViewModel.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidgetViewModel.cs @@ -8,4 +8,5 @@ public class ApplicationActionWidgetViewModel { public Guid ApplicationId { get; set; } public ListResultDto ApplicationActions { get; set; } = new(); + public bool IsRedStop { get; set; } } diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml index 43704eaf19..d40c6bf28d 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml @@ -2,15 +2,20 @@ @using Unity.GrantManager.Localization; @using Microsoft.Extensions.Localization; @using Unity.GrantManager.Web.Views.Shared.Components.ApplicationActionWidget; +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Button; @model ApplicationActionWidgetViewModel; @inject IStringLocalizer L @inject IAuthorizationService AuthorizationService +@{ + var actionButtonType = Model.IsRedStop ? AbpButtonType.Danger : AbpButtonType.Light; +} + + -
    @foreach (var item in Model.ApplicationActions.Items.Where(x => x.IsAuthorized)) @@ -19,7 +24,7 @@ @L[$"Enum:GrantApplicationAction.{item.ApplicationAction}"].Value diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js index 84a0f7143a..26e98c5820 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js @@ -10,6 +10,18 @@ let $button = $(this); attachClickEvent($button); }); + + let isRedStop = document.getElementById('actionWidget_ApplicantIsRedStop')?.value === 'true'; + if (isRedStop) { + let $dropdownToggle = $wrapper.find('#ApplicationActionDropdown .dropdown-toggle'); + $dropdownToggle.attr({ + 'data-bs-toggle': 'popover', + 'data-bs-trigger': 'hover', + 'data-bs-placement': 'top', + 'data-bs-content': l("GrantApplication:ActionButton.RedStopWarning"), + }); + const redstopPopover = new bootstrap.Popover($dropdownToggle[0]); + } } function attachClickEvent($button) { @@ -45,10 +57,10 @@ function customConfirmation(triggerActionEnum) { let confirmationDetails = getConfirmationText(triggerActionEnum); - let isRedStop = $('#redStop').prop("checked"); + let isRedStop = document.getElementById('actionWidget_ApplicantIsRedStop')?.value === 'true'; - if (isRedStop && triggerActionEnum === 'Approve') { - return handleRedStopApproval(); + if (isRedStop) { + return handleRedStopAction(); } if (triggerActionEnum === 'CompleteAssessment') { @@ -58,10 +70,10 @@ } } - function handleRedStopApproval() { + function handleRedStopAction() { return Swal.fire({ icon: "error", - text: "This application is currently flagged as high risk. Approval is not permitted at this time", + text: l("GrantApplication:ActionButton.RedStopWarning"), confirmButtonText: 'Ok', customClass: { confirmButton: 'btn btn-primary' From 2cf6deb74121bef3261eddfbdb3d838e38ff7b5e Mon Sep 17 00:00:00 2001 From: Patrick <135162612+plavoie-BC@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:35:34 -0700 Subject: [PATCH 2/6] [AB#32197] Add popover for Red-Stop restriction warning --- .../Shared/Components/ApplicationActionWidget/Default.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js index 26e98c5820..1a7f765b93 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js @@ -17,10 +17,13 @@ $dropdownToggle.attr({ 'data-bs-toggle': 'popover', 'data-bs-trigger': 'hover', - 'data-bs-placement': 'top', - 'data-bs-content': l("GrantApplication:ActionButton.RedStopWarning"), + 'data-bs-placement': 'top' + }); + let redstopPopover = new bootstrap.Popover($dropdownToggle[0]); + redstopPopover.setContent({ + '.popover-title': 'Red-Stop Restriction', + '.popover-body': l("GrantApplication:ActionButton.RedStopWarning") }); - const redstopPopover = new bootstrap.Popover($dropdownToggle[0]); } } From 33f7bf5e72638f04f8fbb06cdc5619cacd5af496 Mon Sep 17 00:00:00 2001 From: Patrick <135162612+plavoie-BC@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:52:32 -0700 Subject: [PATCH 3/6] [AB#32197] Rename IsApplicantRedStop to IsApplicantRedStopAsync --- .../IGrantApplicationAppService.cs | 2 +- .../GrantApplicationAppService.cs | 18 ++++++++++++------ .../ApplicationActionWidget.cs | 2 +- .../ApplicationActionWidget/Default.js | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs index af8c69ea17..2491deb1c9 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs @@ -22,5 +22,5 @@ public interface IGrantApplicationAppService Task HideAIAnalysisItemAsync(Guid applicationId, string itemId); Task ShowAIAnalysisItemAsync(Guid applicationId, string itemId); Task> GetListAsync(GrantApplicationListInputDto input); - Task IsApplicantRedStop(Guid applicationId); + Task IsApplicantRedStopAsync(Guid applicationId); } diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs index 88511f4029..bcb5aeb071 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs @@ -955,11 +955,17 @@ public async Task GetApplicationStatusAsync(Guid id) return form.AccountCodingId; } - public async Task IsApplicantRedStop(Guid applicationId) + + + public async Task IsApplicantRedStopAsync(Guid applicationId) + { + var application = await applicationRepository.GetAsync(applicationId, false); + return await IsApplicantRedStopInternalAsync(application); + } + + private async Task IsApplicantRedStopInternalAsync(Application grantApplication) { - var application = await applicationRepository.GetAsync(applicationId, true) - ?? throw new EntityNotFoundException($"Application with ID {applicationId} not found."); - var applicant = await applicantRepository.GetAsync(application.ApplicantId); + var applicant = await applicantRepository.GetAsync(grantApplication.ApplicantId); return applicant.RedStop == true; } @@ -982,7 +988,7 @@ public async Task> GetActions(Guid applicati // NOTE: Authorization is applied on the AppService layer and is false by default // AUTHORIZATION HANDLING - bool isRedStop = await IsApplicantRedStop(applicationId); + bool isRedStop = application.Applicant != null && await IsApplicantRedStopInternalAsync(application); foreach (var item in actionDtos) { item.IsPermitted = !isRedStop && item.IsPermitted && (await AuthorizationService.IsGrantedAsync(application, GetActionAuthorizationRequirement(item.ApplicationAction))); @@ -1012,7 +1018,7 @@ public async Task TriggerAction(Guid applicationId, GrantAp } // RED STOP CHECK: Block all status actions when the applicant has RedStop = true - if (await IsApplicantRedStop(applicationId)) + if (await IsApplicantRedStopInternalAsync(application)) { throw new UserFriendlyException(L["GrantApplication:ActionButton.RedStopWarning"]); } diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs index 0d95c298ec..f15c495f7e 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/ApplicationActionWidget.cs @@ -29,7 +29,7 @@ public async Task InvokeAsync(Guid applicationId) { ApplicationId = applicationId, ApplicationActions = await _applicationAppService.GetActions(applicationId), - IsRedStop = await _applicationAppService.IsApplicantRedStop(applicationId) + IsRedStop = await _applicationAppService.IsApplicantRedStopAsync(applicationId) }; return View(viewModel); diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js index 1a7f765b93..ed75e54f5b 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js @@ -16,7 +16,7 @@ let $dropdownToggle = $wrapper.find('#ApplicationActionDropdown .dropdown-toggle'); $dropdownToggle.attr({ 'data-bs-toggle': 'popover', - 'data-bs-trigger': 'hover', + 'data-bs-trigger': 'hover focus', 'data-bs-placement': 'top' }); let redstopPopover = new bootstrap.Popover($dropdownToggle[0]); From a3ebedee8562cb7d285ee5a1b7741f51dc43a0b3 Mon Sep 17 00:00:00 2001 From: Patrick <135162612+plavoie-BC@users.noreply.github.com> Date: Thu, 26 Mar 2026 16:14:29 -0700 Subject: [PATCH 4/6] [AB#32197] Update RedStop warning message and tooltip logic --- .../Localization/GrantManager/en.json | 2 +- .../ApplicationActionWidget/Default.cshtml | 4 +++- .../Components/ApplicationActionWidget/Default.js | 15 --------------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json index 4b3ee78d49..ba3e71c9b4 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json @@ -269,7 +269,7 @@ "AssessmentResultsView:AssessmentResultsForm.RiskRanking": "Risk Ranking", "GrantApplication:ActionButtonName": "Status Actions", - "GrantApplication:ActionButton.RedStopWarning": "This application is flagged as high risk. Status actions are not permitted at this time.", + "GrantApplication:ActionButton.RedStopWarning": "This application is flagged as high risk. Status actions are not permitted.", "Enum:GrantApplicationAction.Open": "Open", "Enum:GrantApplicationAction.Submit": "Submit", "Enum:GrantApplicationAction.Internal_Assign": "Assign", diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml index d40c6bf28d..eb5e369e3d 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml @@ -11,12 +11,14 @@ @{ var actionButtonType = Model.IsRedStop ? AbpButtonType.Danger : AbpButtonType.Light; + var actionButtonTitleText = Model.IsRedStop ? L["GrantApplication:ActionButton.RedStopWarning"].Value : string.Empty; } + text="@L["GrantApplication:ActionButtonName"].Value" + title="@actionButtonTitleText" />
      @foreach (var item in Model.ApplicationActions.Items.Where(x => x.IsAuthorized)) { diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js index ed75e54f5b..2d7fc573ea 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.js @@ -10,21 +10,6 @@ let $button = $(this); attachClickEvent($button); }); - - let isRedStop = document.getElementById('actionWidget_ApplicantIsRedStop')?.value === 'true'; - if (isRedStop) { - let $dropdownToggle = $wrapper.find('#ApplicationActionDropdown .dropdown-toggle'); - $dropdownToggle.attr({ - 'data-bs-toggle': 'popover', - 'data-bs-trigger': 'hover focus', - 'data-bs-placement': 'top' - }); - let redstopPopover = new bootstrap.Popover($dropdownToggle[0]); - redstopPopover.setContent({ - '.popover-title': 'Red-Stop Restriction', - '.popover-body': l("GrantApplication:ActionButton.RedStopWarning") - }); - } } function attachClickEvent($button) { From ee61e0f62848c0aaa2094666bcd22e6ac32576eb Mon Sep 17 00:00:00 2001 From: Patrick <135162612+plavoie-BC@users.noreply.github.com> Date: Thu, 26 Mar 2026 16:29:59 -0700 Subject: [PATCH 5/6] [AB#32197] Refactor RedStop checks in application service and view --- .../GrantApplicationAppService.cs | 14 ++++---------- .../ApplicationActionWidget/Default.cshtml | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs index bcb5aeb071..022a1ad34d 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs @@ -959,14 +959,8 @@ public async Task GetApplicationStatusAsync(Guid id) public async Task IsApplicantRedStopAsync(Guid applicationId) { - var application = await applicationRepository.GetAsync(applicationId, false); - return await IsApplicantRedStopInternalAsync(application); - } - - private async Task IsApplicantRedStopInternalAsync(Application grantApplication) - { - var applicant = await applicantRepository.GetAsync(grantApplication.ApplicantId); - return applicant.RedStop == true; + var application = await applicationRepository.GetAsync(applicationId, true); + return application.Applicant != null && application.Applicant.RedStop == true; } #region APPLICATION WORKFLOW @@ -988,7 +982,7 @@ public async Task> GetActions(Guid applicati // NOTE: Authorization is applied on the AppService layer and is false by default // AUTHORIZATION HANDLING - bool isRedStop = application.Applicant != null && await IsApplicantRedStopInternalAsync(application); + bool isRedStop = application.Applicant != null && application.Applicant.RedStop == true; foreach (var item in actionDtos) { item.IsPermitted = !isRedStop && item.IsPermitted && (await AuthorizationService.IsGrantedAsync(application, GetActionAuthorizationRequirement(item.ApplicationAction))); @@ -1018,7 +1012,7 @@ public async Task TriggerAction(Guid applicationId, GrantAp } // RED STOP CHECK: Block all status actions when the applicant has RedStop = true - if (await IsApplicantRedStopInternalAsync(application)) + if (application.Applicant != null && application.Applicant.RedStop == true) { throw new UserFriendlyException(L["GrantApplication:ActionButton.RedStopWarning"]); } diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml index eb5e369e3d..2e2259a920 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationActionWidget/Default.cshtml @@ -26,7 +26,7 @@ @L[$"Enum:GrantApplicationAction.{item.ApplicationAction}"].Value From d51241cf0dbcd0a865d73b9badecd5d4c5b301db Mon Sep 17 00:00:00 2001 From: Patrick <135162612+plavoie-BC@users.noreply.github.com> Date: Thu, 26 Mar 2026 18:18:06 -0700 Subject: [PATCH 6/6] [AB#32197] Update red-stop warning text --- .../Localization/GrantManager/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json index ba3e71c9b4..fe3e30cd2c 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json @@ -269,7 +269,7 @@ "AssessmentResultsView:AssessmentResultsForm.RiskRanking": "Risk Ranking", "GrantApplication:ActionButtonName": "Status Actions", - "GrantApplication:ActionButton.RedStopWarning": "This application is flagged as high risk. Status actions are not permitted.", + "GrantApplication:ActionButton.RedStopWarning": "This application is from an applicant with a Red-Stop. Status actions are not permitted.", "Enum:GrantApplicationAction.Open": "Open", "Enum:GrantApplicationAction.Submit": "Submit", "Enum:GrantApplicationAction.Internal_Assign": "Assign",