From 0cedb5fc4d53437dd18e6f6223c1d2d190c26c93 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Wed, 17 Jun 2026 10:39:11 -0700
Subject: [PATCH 01/23] [AB#31718] Normalize form control layout for form
 configuration tabs

---
 .../Pages/ApplicationForms/Mapping.cshtml     | 101 +++++++++---------
 .../Pages/ApplicationForms/Mapping.css        |  38 ++++++-
 .../SettingManagement/ZoneManagement.cshtml   |  22 ++--
 .../Default.cshtml                            |  52 +++++----
 4 files changed, 126 insertions(+), 87 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
index e79ea92c37..f21356c1eb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
@@ -84,8 +84,30 @@
         <!--Tab Content: Mapping-->
         <div class="tab-pane fade show active" id="nav-mapping" role="tabpanel" aria-labelledby="nav-mapping-tab">
             <input type="hidden" id="refresh_available_worksheets" value="" />
+            <div class="configuration-action-bar row">
+                <div class="col-12 col-md-8">
+                    <h5>Mapping Configuration</h5>
+                </div>
+                <div class="col-12 col-md-4 btn-wrapper">
+                    <abp-button id="btn-save" text="Save" icon-type="Other" icon="fl fl-save"
+                                class="btn unt-btn-primary btn-primary"
+                                style="pointer-events: all;"
+                                abp-tooltip="Save the Scoresheet and the Mapping of CHEFS fields to Unity Fields"
+                                button-type="Primary" />
+                    <abp-button id="btn-edit" text="Edit Mapping" icon-type="Other" data-target="#editMappingModal"
+                                icon="fl fl-edit" class="btn unt-btn-primary btn-primary" data-toggle="modal"
+                                style="pointer-events: all;" abp-tooltip="Edit the Mapping JSON Manually"
+                                button-type="Primary" />
+                    <abp-button id="btn-reset" text="Reset Mapping" icon-type="Other" icon="fl fl-undo"
+                                class="btn unt-btn-outline-primary btn-outline-primary"
+                                abp-tooltip="This button resets the mapping to the last saved state" />
+                    <abp-button id="btn-back" text="Back"
+                                class="btn unt-btn-outline-primary btn-outline-primary"
+                                abp-tooltip="Navigate back to the Forms" />
+                </div>
+            </div>
             <div class="row">
-                <div class="col-4 p-3">
+                <div class="col-12 col-md-4 p-3">
                     <label for="applicationFormVersion" class="form-label">Version:</label>
                     <div class="select-icon-wrapper">
                         <select class="form-select form-control" id="applicationFormVersion" name="Version">
@@ -113,7 +135,7 @@
                         }
                     </div>
                 </div>
-                <div class="col-4 p-3">
+                <div class="col-12 col-md-4 p-3">
                     <label for="chefsFormVersionId" class="form-label">Form Version ID:</label>
                     <div class="input-button-wrapper ">
                         <input id="chefsFormVersionId" class="form-control input-width" type="text"
@@ -182,29 +204,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-12">
-                    <div class="buttons">
-                        <div class="buttons-div">
-                            <abp-button id="btn-save" text="Save" icon-type="Other"
-                                class="btn unt-btn-primary btn-primary mx-1" style="pointer-events: all;"
-                                abp-tooltip="Save the Scoresheet and the Mapping of CHEFS fields to Unity Fields"
-                                button-type="Primary" />
-                            <abp-button id="btn-edit" text="Edit Mapping" icon-type="Other" data-target="#editMappingModal"
-                                icon="fl fl-edit" class="btn unt-btn-primary btn-primary mx-1" data-toggle="modal"
-                                style="pointer-events: all;" abp-tooltip="Edit the Mapping JSON Manually"
-                                button-type="Primary" />
-                            <abp-button id="btn-reset" text="Reset Mapping" icon-type="Other" icon="fl fl-undo"
-                                class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                abp-tooltip="This button resets the mapping to the last saved state" />
-                            <abp-button id="btn-back" text="Back"
-                                class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                abp-tooltip="Navigate back to the Forms" />
-                        </div>
-                    </div>
-                </div>
-            </div>        
-        </div>      
+        </div>
 
         <!--Tab Content: Worksheets-->
         @if (Model?.FlexEnabled == true)
@@ -255,19 +255,33 @@
         @if (Model?.ShowAITab == true)
         {
             <!--Tab Content: AI Configuration-->
-            <div class="tab-pane fade" id="nav-ai-configuration" role="tabpanel"
-                aria-labelledby="nav-ai-configuration-tab">
-                <div class="p-3">
-                    <h6 class="mb-3"><b>AI Configuration</b></h6>
-
+            <div class="tab-pane fade" id="nav-ai-configuration" role="tabpanel" aria-labelledby="nav-ai-configuration-tab">
+                <div class="configuration-action-bar row">
+                    <div class="col-12 col-md-8">
+                        <h5>AI Configuration</h5>
+                    </div>
+                    <div class="col-12 col-md-4 btn-wrapper">
+                        <abp-button id="btn-save-ai-config"
+                                    text="Save"
+                                    icon-type="Other"
+                                    icon="fl fl-save"
+                                    class="btn unt-btn-primary btn-primary"
+                                    button-type="Primary" />
+                        <abp-button id="btn-cancel-ai-config"
+                                    class="btn unt-btn-outline-primary btn-outline-primary mx-1"
+                                    abp-tooltip="Cancel changes">Cancel</abp-button>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12 p-3">
                     @if (Model?.ShowAutomatic == true)
                     {
                         <div class="form-check form-switch mb-3">
                             <input class="form-check-input"
-                                   type="checkbox"
-                                   id="AutomaticallyGenerateAIAnalysis"
-                                   name="AutomaticallyGenerateAIAnalysis"
-                                   @(Model.ApplicationFormDto?.AutomaticallyGenerateAIAnalysis == true ? "checked" : "") />
+                                    type="checkbox"
+                                    id="AutomaticallyGenerateAIAnalysis"
+                                    name="AutomaticallyGenerateAIAnalysis"
+                                    @(Model.ApplicationFormDto?.AutomaticallyGenerateAIAnalysis == true ? "checked" : "") />
                             <label class="form-check-label fw-bold" for="AutomaticallyGenerateAIAnalysis">
                                 Automatically Generate AI Analysis
                             </label>
@@ -282,10 +296,10 @@
                     {
                         <div class="form-check form-switch mb-3">
                             <input class="form-check-input"
-                                   type="checkbox"
-                                   id="ManuallyInitiateAIAnalysis"
-                                   name="ManuallyInitiateAIAnalysis"
-                                   @(Model.ApplicationFormDto?.ManuallyInitiateAIAnalysis == true ? "checked" : "") />
+                                    type="checkbox"
+                                    id="ManuallyInitiateAIAnalysis"
+                                    name="ManuallyInitiateAIAnalysis"
+                                    @(Model.ApplicationFormDto?.ManuallyInitiateAIAnalysis == true ? "checked" : "") />
                             <label class="form-check-label fw-bold" for="ManuallyInitiateAIAnalysis">
                                 Manually Initiate AI Analysis
                             </label>
@@ -295,17 +309,6 @@
                             </div>
                         </div>
                     }
-
-                    <div class="d-flex justify-content-start mt-3">
-                        <abp-button id="btn-save-ai-config"
-                                    text="Save"
-                                    icon-type="Other"
-                                    icon="fl fl-save"
-                                    class="btn unt-btn-primary btn-primary"
-                                    button-type="Primary" />
-                        <abp-button id="btn-cancel-ai-config"
-                                    class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                    abp-tooltip="Cancel changes">Cancel</abp-button>
                     </div>
                 </div>
             </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
index c0f6c98742..52347591aa 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
@@ -6,10 +6,40 @@
     background-color: white;
 }
 
-.column {
-    float: left;
-    width: 40%;
-  }
+.configuration-action-bar {
+    align-items: center;
+    border-bottom: 1px solid #dee2e6;
+    padding-bottom: 0.5rem;
+    margin-bottom: 0.5rem;
+    padding-right: calc(var(--bs-gutter-x) * 0.5);
+    padding-left: calc(var(--bs-gutter-x) * 0.5);
+}
+
+    .configuration-action-bar h5 {
+        font-weight: 700;
+    }
+
+    .configuration-action-bar .btn {
+        flex: none;
+        min-width: 100px;
+        padding: 0.375rem 0.75rem;
+        font-weight: 500;
+        transition: all 0.15s ease-in-out;
+        justify-content: center !important;
+    }
+
+    .configuration-action-bar .btn-wrapper {
+        gap: 0.5rem;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end !important;
+        padding-right: 0;
+    }
+
+    .column {
+        float: left;
+        width: 40%;
+    }
   
   /* Clear floats after the columns */
   .row:after {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
index 7a1e3dad87..efea9c81e4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
@@ -12,6 +12,20 @@
 
 <form id="ZoneManagementForm" method="post" asp-page="/SettingManagement/ZoneManagement" data-script-class="abp.modals.ZoneManagement">
     <div class="container-fluid">
+        <div class="configuration-action-bar row">
+            <div class="col-12 col-md-8">
+                <h5>User Interface Configuration</h5>
+            </div>
+            <div class="col-12 col-md-4 btn-wrapper">
+                <abp-button button-type="Primary" 
+                            text="Save" icon-type="Other" icon="fl fl-save"
+                            class="btn unt-btn-primary btn-primary"
+                            type="submit"></abp-button>
+                <abp-button id="btn-cancel" 
+                            class="btn unt-btn-outline-primary btn-outline-primary"
+                            abp-tooltip="Navigate back to the Forms">Back</abp-button>
+            </div>
+        </div>
         <div class="row">
             <div class="col-12">
                 <input asp-for="@Model.ProviderKey" />
@@ -61,13 +75,7 @@
         <div class="row">
             <div class="col-12">
                 <div class="d-flex justify-content-start">
-                    <abp-button button-type="Primary" 
-                                text="Save"
-                                icon-type="Other"
-                                icon="fl fl-save"
-                                class="btn unt-btn-primary btn-primary"
-                                type="submit"></abp-button>
-                    <abp-button id="btn-cancel" class="btn unt-btn-outline-primary btn-outline-primary mx-1" abp-tooltip="Navigate back to the Forms">Back</abp-button>
+                    
                 </div>
             </div>
         </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
index a37d8d7332..c597684a6b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
@@ -10,6 +10,31 @@
 
 <div class="other-config-scrollable-content">
 <form id="otherConfigForm" autocomplete="off">
+    <div class="configuration-action-bar row">
+        <div class="col-12 col-md-8">
+            <h5>Other Configuration</h5>
+        </div>
+        <div class="col-12 col-md-4 d-flex align-items-center justify-content-end gap-2">
+            <abp-button id="btn-save-other-config"
+                        text="Save"
+                        icon-type="Other" icon="fl fl-save"
+                        class="btn unt-btn-primary btn-primary"
+                        abp-tooltip="Save Other Configuration"
+                        button-type="Primary" />
+            <button type="reset"
+                    id="btn-cancel-other-config"
+                    class="btn unt-btn-outline-primary btn-outline-primary"
+                    abp-tooltip="Cancel changes">
+                <i class="fl fl-undo"></i> Cancel
+            </button>
+            <button type="reset"
+                    id="btn-back-other-config"
+                    class="btn unt-btn-outline-primary btn-outline-primary"
+                    abp-tooltip="Navigate back to the Forms">
+                Back
+            </button>
+        </div>
+    </div>
     <div class="row">
         <div class="col-12 p-3">
             <h6 class="mb-3"><b>Workflow Settings</b></h6>
@@ -101,32 +126,5 @@
             </label>
         </div>
     </div>
-
-
-    <div class="row">
-        <div class="col-12">
-            <div class="d-flex justify-content-start">
-                <abp-button id="btn-save-other-config"
-                            text="Save"
-                            icon-type="Other"
-                            icon="fl fl-save"
-                            class="btn unt-btn-primary btn-primary mx-1"
-                            abp-tooltip="Save Other Configuration"
-                            button-type="Primary" />
-                <button type="reset"
-                        id="btn-cancel-other-config"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                        abp-tooltip="Cancel changes">
-                    <i class="fl fl-undo"></i> Cancel
-                </button>
-                <button type="reset"
-                        id="btn-back-other-config"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                        abp-tooltip="Navigate back to the Forms">
-                    Back
-                </button>
-            </div>
-        </div>
-    </div>
 </form>
 </div>

From 238c440148142f33e283df9ac050b20269942615 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Mon, 22 Jun 2026 09:45:07 -0700
Subject: [PATCH 02/23] [AB#31718] Add Standardized Form Config Action Bar

---
 .../Pages/ApplicationForms/Mapping.cshtml     | 18 +++----
 .../Pages/ApplicationForms/Mapping.css        | 12 +++--
 .../SettingManagement/ZoneManagement.cshtml   |  2 +-
 .../Components/CustomFields/Default.cshtml    | 48 +++++++++----------
 .../PaymentConfiguration/Default.cshtml       | 26 ++++++++--
 5 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
index f21356c1eb..32108b2d58 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
@@ -82,10 +82,10 @@
     </nav>
     <div class="tab-content unt-tab-content" id="nav-tabContent">
         <!--Tab Content: Mapping-->
-        <div class="tab-pane fade show active" id="nav-mapping" role="tabpanel" aria-labelledby="nav-mapping-tab">
+        <div id="nav-mapping" class="tab-pane fade show active container-fluid" role="tabpanel" aria-labelledby="nav-mapping-tab">
             <input type="hidden" id="refresh_available_worksheets" value="" />
             <div class="configuration-action-bar row">
-                <div class="col-12 col-md-8">
+                <div class="col-12 col-md-8 px-0">
                     <h5>Mapping Configuration</h5>
                 </div>
                 <div class="col-12 col-md-4 btn-wrapper">
@@ -107,7 +107,7 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-12 col-md-4 p-3">
+                <div class="col-6 p-3">
                     <label for="applicationFormVersion" class="form-label">Version:</label>
                     <div class="select-icon-wrapper">
                         <select class="form-select form-control" id="applicationFormVersion" name="Version">
@@ -135,7 +135,7 @@
                         }
                     </div>
                 </div>
-                <div class="col-12 col-md-4 p-3">
+                <div class="col-6 p-3">
                     <label for="chefsFormVersionId" class="form-label">Form Version ID:</label>
                     <div class="input-button-wrapper ">
                         <input id="chefsFormVersionId" class="form-control input-width" type="text"
@@ -209,7 +209,7 @@
         <!--Tab Content: Worksheets-->
         @if (Model?.FlexEnabled == true)
         {
-            <div class="tab-pane fade" id="nav-custom-fields" role="tabpanel" aria-labelledby="nav-custom-fields-tab">
+            <div id="nav-custom-fields" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-custom-fields-tab">
                 <div id="customFieldsWidget">
                     @await Component.InvokeAsync("CustomFields", 
                         new {   formVersionId = @Model?.ApplicationFormVersionDto?.ChefsFormVersionGuid, 
@@ -226,7 +226,7 @@
         @if (await FeatureChecker.IsEnabledAsync("Unity.Payments"))
         {
         <!--Tab Content: Payment Configuration-->
-        <div class="tab-pane fade" id="nav-payment-configuration" role="tabpanel" aria-labelledby="nav-payment-configuration-tab">
+        <div id="nav-payment-configuration" class="tab-pane fade" role="tabpanel" aria-labelledby="nav-payment-configuration-tab">
             <div id="paymentConfigurationWidget">
                 @await Component.InvokeAsync("PaymentConfiguration", new { formid = @Model?.ApplicationFormDto?.Id})
             </div>
@@ -255,9 +255,9 @@
         @if (Model?.ShowAITab == true)
         {
             <!--Tab Content: AI Configuration-->
-            <div class="tab-pane fade" id="nav-ai-configuration" role="tabpanel" aria-labelledby="nav-ai-configuration-tab">
-                <div class="configuration-action-bar row">
-                    <div class="col-12 col-md-8">
+            <div id="nav-ai-configuration" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-ai-configuration-tab">
+                <div class="configuration-action-bar row px-0">
+                    <div class="col-12 col-md-8 px-0">
                         <h5>AI Configuration</h5>
                     </div>
                     <div class="col-12 col-md-4 btn-wrapper">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
index 52347591aa..a60776ecc7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.css
@@ -11,15 +11,13 @@
     border-bottom: 1px solid #dee2e6;
     padding-bottom: 0.5rem;
     margin-bottom: 0.5rem;
-    padding-right: calc(var(--bs-gutter-x) * 0.5);
-    padding-left: calc(var(--bs-gutter-x) * 0.5);
 }
 
     .configuration-action-bar h5 {
         font-weight: 700;
     }
 
-    .configuration-action-bar .btn {
+    .configuration-action-bar .btn, .configuration-action-bar .btn-group {
         flex: none;
         min-width: 100px;
         padding: 0.375rem 0.75rem;
@@ -316,10 +314,16 @@ textarea {
 .unt-mapping-container {
     height: calc(97vh - 400px);
     overflow: scroll;
-    overflow-x:hidden;
+    overflow-x: hidden;
     border: 1px solid black;
 }
 
+.custom-fields-container {
+    height: calc(97vh - 400px);
+    overflow: scroll;
+    overflow-x: hidden;
+}
+
 .nav-tabs .nav-link.active {
     color: #003366;
     border-bottom: 3px solid #003366;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
index efea9c81e4..67f627d91f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
@@ -13,7 +13,7 @@
 <form id="ZoneManagementForm" method="post" asp-page="/SettingManagement/ZoneManagement" data-script-class="abp.modals.ZoneManagement">
     <div class="container-fluid">
         <div class="configuration-action-bar row">
-            <div class="col-12 col-md-8">
+            <div class="col-12 col-md-8 px-0">
                 <h5>User Interface Configuration</h5>
             </div>
             <div class="col-12 col-md-4 btn-wrapper">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
index bf6acd2ef9..cb3c56e011 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
@@ -5,8 +5,29 @@
     Layout = null;
 }
 
+<div class="configuration-action-bar row">
+    <div class="col-12 col-md-8 px-0">
+        <h5>Scoresheet & Worksheets Configuration</h5>
+    </div>
+    <div class="col-12 col-md-4 btn-wrapper">
+        <abp-button id="btn-save-worksheet-config"
+                    text="Save"
+                    type="submit"
+                    icon-type="Other"
+                    icon="fl fl-save"
+                    class="btn unt-btn-primary btn-primary"
+                    style="pointer-events: all;"
+                    abp-tooltip="Save the Worksheet associations to the Mapping of to the Available Unity Worksheet Fields"
+                    button-type="Primary"
+                    form="worksheet-config-form" />
+        <abp-button id="btn-back-worksheet-config"
+                    text="Back"
+                    class="btn unt-btn-outline-primary btn-outline-primary"
+                    abp-tooltip="Navigate back to the Forms" />
+    </div>
+</div>
 <div class="row">
-    <div class="col-6 p-3">
+    <div class="col-6 p-3 pb-0">
         <label for="applicationFormVersionRo" class="form-label">Version:</label>
         <div class="select-icon-wrapper">
             <select class="form-select form-control" id="applicationFormVersionRo" name="Version" disabled>
@@ -18,14 +39,14 @@
             }
         </div>
     </div>
-    <div class="col-6 p-3">
+    <div class="col-6 p-3 pb-0">
         <input type="hidden" id="originalScoresheetId" value="@Model!.ScoresheetId" />
         <abp-select asp-for="@Model.ScoresheetId" asp-items="@Model.ScoresheetOptionsList" id="scoresheet" label="Scoresheets:">
             <option value="">Please choose...</option>
         </abp-select>
     </div>
 </div>
-<div id="custom-fields-div" class="custom-fields-container" >
+<div id="custom-fields-div" class="custom-fields-container">
     <form method="post" asp-controller="CustomFields" asp-action="UpdateCustomFields" id="worksheet-config-form">
         <abp-input type="hidden" id="ChefsFormVersionId" asp-for="@Model.ChefsFormVersionId" />
         <abp-input type="hidden" id="AssessmentInfoSlotIds" asp-for="@Model.AssessmentInfoSlotIds" />
@@ -48,27 +69,6 @@
                         </div>
                     }
                 </div>
-                <div class="button-row row">
-                    <div class="col-12">
-                        <div class="buttons">
-                            <div class="buttons-div">
-                                <abp-button id="btn-save-worksheet-config"
-                                            text="Save"
-                                            type="submit"
-                                            icon-type="Other"                                
-                                            class="btn unt-btn-primary btn-primary mx-1"
-                                            style="pointer-events: all;"
-                                            abp-tooltip="Save the Worksheet associations to the Mapping of to the Available Unity Worksheet Fields"
-                                            button-type="Primary" />
-
-                                <abp-button id="btn-back-worksheet-config"
-                                            text="Back"
-                                            class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                                            abp-tooltip="Navigate back to the Forms" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </div>
             <div class="slots-col">
                 <div class="slot-title">Assessment Info:</div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
index 03873fff76..6e90f856ee 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
@@ -14,10 +14,29 @@
 <abp-input asp-for="@Model.HasEditFormPaymentConfiguration" type="hidden" />
 
 <form id="PaymentThresholdForm" class="payment-configuration-container px-3 pb-2">
+    <div class="configuration-action-bar row">
+        <div class="col-12 col-md-8 px-0">
+            <h5>Payment Configuration</h5>
+        </div>
+        <div class="col-12 col-md-4 btn-wrapper">
+            <abp-button id="btn-save-payment-configuration"
+                        text="Save"
+                        type="submit"
+                        icon-type="Other"
+                        icon="fl fl-save"
+                        class="btn unt-btn-primary btn-primary"
+                        style="pointer-events: all;"
+                        button-type="Primary" />
+            <abp-button id="btn-back-payment-configuration"
+                        text="Back"
+                        class="btn unt-btn-outline-primary btn-outline-primary"
+                        abp-tooltip="Navigate back to the Forms" />
+        </div>
+    </div>
     <div class="payment-configuration-scroll flex-grow-1">
         <fieldset name="Unity_GrantManager_ApplicationForms_Mapping_PaymentConfiguration" 
             class="unity-zone" @(Model.HasEditFormPaymentConfiguration ? string.Empty : "disabled")>
-            <legend class="h6 ps-1 pb-2 pt-2 mt-3 fw-bold">Payment Configuration</legend>
+            <legend class="h6 ps-1 pb-2 pt-2 mt-3 fw-bold d-none">Payment Configuration</legend>
     <div>
         <abp-row class="m-0 payment-configuration-form">
             <abp-column size="_12" class="px-0">
@@ -123,10 +142,7 @@
     </div>
         </fieldset>
         <div class="d-flex justify-content-start">
-            <abp-button id="btn-save-payment-configuration" button-type="Primary" text="Save" icon-type="Other" icon="fl fl-save"
-                class="btn unt-btn-primary btn-primary"></abp-button>
-            <abp-button id="btn-back-payment-configuration" class="btn unt-btn-outline-primary btn-outline-primary mx-1"
-                abp-tooltip="Navigate back to the Forms">Back</abp-button>
+            
         </div>
     </div>
     

From be63e851d4f7d0f07d1417821dac5f8deef2d4a8 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Mon, 22 Jun 2026 14:03:00 -0700
Subject: [PATCH 03/23] AB#33493: Sanitize HTML of Scoresheets

---
 .../Components/Scoresheet/Default.cshtml      |  4 +-
 .../Components/Scoresheet/Scoresheet.js       | 69 +++++++++++++++++--
 .../Utilities/HtmlHelperExtensions.cs         | 25 ++++++-
 3 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml
index 4b270ad47c..852d0e2e64 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Default.cshtml
@@ -1,6 +1,5 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Unity.Flex.Localization;
-@using Unity.Flex.Web.Views.Shared.Components.Scoresheet;
 @using Volo.Abp.Authorization.Permissions;
 @inject IHtmlLocalizer<FlexResource> L
 @inject IPermissionChecker PermissionChecker
@@ -99,7 +98,8 @@
                                         data-maxlength="@question.GetMaxLength()" 
                                         data-yesvalue="@question.GetYesValue()" 
                                         data-novalue="@question.GetNoValue()" 
-                                        data-questiondesc="@question.Description" 
+                                        data-questionlabel="@question.Label"
+                                        data-questiondesc="@question.Description"
                                         data-definition="@question.Definition"
                                         data-rows="@question.GetRowsValue()"
                                         data-required="@question.GetIsRequiredValue()">
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
index 4143e200d7..3a248ebb12 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
@@ -1,3 +1,58 @@
+function sanitizeHtml(html) {
+    if (!html) return '';
+
+    const ALLOWED_TAGS = new Set([
+        'a', 'b', 'blockquote', 'br', 'code', 'del', 'em',
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
+        'li', 'ol', 'p', 'pre', 's', 'span', 'strong', 'u', 'ul'
+    ]);
+    const ALLOWED_ATTRS = new Set(['href', 'rel', 'target', 'title']);
+    const ALLOWED_SCHEMES = ['http:', 'https:', 'mailto:'];
+    const STRIP_WITH_CONTENT = new Set(['script', 'style', 'iframe', 'noscript', 'object', 'embed']);
+
+    const template = document.createElement('template');
+    template.innerHTML = html;
+
+    // Process bottom-up so children are handled before their parent is unwrapped/removed
+    const elements = Array.from(template.content.querySelectorAll('*')).reverse();
+    for (const el of elements) {
+        const tag = el.tagName.toLowerCase();
+        if (STRIP_WITH_CONTENT.has(tag)) {
+            el.remove();
+        } else if (!ALLOWED_TAGS.has(tag)) {
+            el.replaceWith(...Array.from(el.childNodes));
+        } else {
+            for (const attr of Array.from(el.attributes)) {
+                if (!ALLOWED_ATTRS.has(attr.name)) {
+                    el.removeAttribute(attr.name);
+                } else if (attr.name === 'href') {
+                    try {
+                        const url = new URL(el.getAttribute('href'), location.href);
+                        if (!ALLOWED_SCHEMES.includes(url.protocol)) {
+                            el.removeAttribute('href');
+                        }
+                    } catch (e) {
+                        console.warn('sanitizeHtml: invalid href removed:', e);
+                        el.removeAttribute('href');
+                    }
+                }
+            }
+        }
+    }
+
+    const wrapper = document.createElement('div');
+    wrapper.appendChild(template.content);
+    return wrapper.innerHTML;
+}
+
+function escapeHtml(text) {
+    return String(text)
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;');
+}
+
 $(function () {
 
     function makeScoresheetsSortable() {
@@ -149,7 +204,7 @@ $(function () {
                 <form method="post" id="section-form-${hashCode(item.innerText)}" onSubmit="return false;">
                 <h2 class="accordion-header" id="panel-${hashCode(item.innerText)}">
                     <button class="accordion-button preview-btn unt-accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-${hashCode(item.innerText)}" aria-expanded="true" aria-controls="collapse-${hashCode(item.innerText)}">
-                        ${sectionNumber}.  ${item.dataset.label}
+                        ${sectionNumber}.  ${escapeHtml(item.dataset.label)}
                     </button>
                 </h2>
                 <div id="collapse-${hashCode(item.innerText)}" class="accordion-collapse collapse show" aria-labelledby="panel-${hashCode(item.innerText)}">
@@ -163,7 +218,7 @@ $(function () {
                     <div class="accordion-item">
                         <h2 class="accordion-header" id="nested-panel${hashCode(item.innerText)}">
                             <button class="accordion-button question-btn collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#nested-collapse${hashCode(item.innerText)}" aria-expanded="true" aria-controls="nested-collapse${hashCode(item.innerText)}">
-                                ${sectionNumber}.${questionNumber}  ${item.innerText} ${item.dataset.required == 'True' ? '*' : ''}
+                                ${sectionNumber}.${questionNumber}  ${sanitizeHtml(item.dataset.questionlabel)} ${item.dataset.required == 'True' ? '*' : ''}
                             </button>
                         </h2>
                         <div id="nested-collapse${hashCode(item.innerText)}" class="accordion-collapse collapse" aria-labelledby="nested-panel${hashCode(item.innerText)}">
@@ -219,7 +274,7 @@ $(function () {
     function buildTextAreaFieldPreview(item) {
         let req = item.dataset.required ? "required" : null;
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-text-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <textarea rows="${item.dataset.rows}" type="text" ${req} class="form-control answer-text-input" minlength="${item.dataset.minlength}" maxlength="${item.dataset.maxlength}" 
@@ -238,7 +293,7 @@ $(function () {
         }).join('');
 
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-selectlist-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <select id="answer-selectlist-${item.dataset.id}"
@@ -254,7 +309,7 @@ $(function () {
     function buildNumberFieldPreview(item) {
         let req = item.dataset.required ? "required" : null;
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-number-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <input type="number" ${req} class="form-control answer-number-input" min="${item.dataset.min}" max="${item.dataset.max}" 
@@ -266,7 +321,7 @@ $(function () {
 
     function buildYesNoFieldPreview(item) {
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-yesno-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <select id="answer-yesno-${item.dataset.id}"
@@ -287,7 +342,7 @@ $(function () {
         let req = item.dataset.required ? "required" : null;
 
         return `
-                    <p>${item.dataset.questiondesc}</p>
+                    <p>${sanitizeHtml(item.dataset.questiondesc)}</p>
                     <div class="mb-3">
                         <label for="answer-text-${item.dataset.id}" class="form-label unt-form-label">Answer</label>
                         <input type="text" ${req} class="form-control answer-text-input" minlength="${item.dataset.minlength}" maxlength="${item.dataset.maxlength}" 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Utilities/HtmlHelperExtensions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Utilities/HtmlHelperExtensions.cs
index 1f104ce2fb..b7cfad3c89 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Utilities/HtmlHelperExtensions.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Utilities/HtmlHelperExtensions.cs
@@ -6,11 +6,34 @@ namespace Unity.GrantManager.Web.Utilities;
 
 public static class HtmlHelperExtensions
 {
-    private static readonly HtmlSanitizer _sanitizer = new();
+    private static readonly HtmlSanitizer _sanitizer = BuildSanitizer();
 
     public static IHtmlContent SanitizeRaw(this IHtmlHelper _, string? value)
     {
         if (string.IsNullOrEmpty(value)) return HtmlString.Empty;
         return new HtmlString(_sanitizer.Sanitize(value));
     }
+
+    private static HtmlSanitizer BuildSanitizer()
+    {
+        var sanitizer = new HtmlSanitizer();
+
+        sanitizer.AllowedTags.Clear();
+        sanitizer.AllowedTags.UnionWith(
+        [
+            "a", "b", "blockquote", "br", "code", "del", "em",
+            "h1", "h2", "h3", "h4", "h5", "h6", "hr", "i",
+            "li", "ol", "p", "pre", "s", "span", "strong", "u", "ul"
+        ]);
+
+        sanitizer.AllowedAttributes.Clear();
+        sanitizer.AllowedAttributes.UnionWith(["href", "rel", "target", "title"]);
+
+        sanitizer.AllowedSchemes.Clear();
+        sanitizer.AllowedSchemes.UnionWith(["http", "https", "mailto"]);
+
+        sanitizer.AllowedCssProperties.Clear();
+
+        return sanitizer;
+    }
 }

From adc885283d0402e9bd577e838c87fae29f9f3ecf Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:21:52 -0700
Subject: [PATCH 04/23] [AB#31718] Form Configuration Action Bar Quality Fixes

---
 .../Pages/ApplicationForms/Mapping.cshtml              |  8 ++++++--
 .../Pages/SettingManagement/ZoneManagement.cshtml      | 10 +---------
 .../ApplicationFormConfigWidget/Default.cshtml         |  4 ++--
 .../Shared/Components/CustomFields/Default.cshtml      |  4 ++--
 .../Components/PaymentConfiguration/Default.cshtml     | 10 +++-------
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
index 32108b2d58..5d4de6d9c1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
@@ -85,7 +85,7 @@
         <div id="nav-mapping" class="tab-pane fade show active container-fluid" role="tabpanel" aria-labelledby="nav-mapping-tab">
             <input type="hidden" id="refresh_available_worksheets" value="" />
             <div class="configuration-action-bar row">
-                <div class="col-12 col-md-8 px-0">
+                <div class="col-12 col-md-8">
                     <h5>Mapping Configuration</h5>
                 </div>
                 <div class="col-12 col-md-4 btn-wrapper">
@@ -257,7 +257,7 @@
             <!--Tab Content: AI Configuration-->
             <div id="nav-ai-configuration" class="tab-pane fade container-fluid" role="tabpanel" aria-labelledby="nav-ai-configuration-tab">
                 <div class="configuration-action-bar row px-0">
-                    <div class="col-12 col-md-8 px-0">
+                    <div class="col-12 col-md-8">
                         <h5>AI Configuration</h5>
                     </div>
                     <div class="col-12 col-md-4 btn-wrapper">
@@ -269,7 +269,11 @@
                                     button-type="Primary" />
                         <abp-button id="btn-cancel-ai-config"
                                     class="btn unt-btn-outline-primary btn-outline-primary mx-1"
+                                    icon-type="Other" icon="fl fl-undo"
                                     abp-tooltip="Cancel changes">Cancel</abp-button>
+                        <abp-button id="btn-back-ai-config" text="Back"
+                                    class="btn unt-btn-outline-primary btn-outline-primary"
+                                    abp-tooltip="Navigate back to the Forms" />
                     </div>
                 </div>
                 <div class="row">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
index 67f627d91f..e749facf27 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/SettingManagement/ZoneManagement.cshtml
@@ -13,7 +13,7 @@
 <form id="ZoneManagementForm" method="post" asp-page="/SettingManagement/ZoneManagement" data-script-class="abp.modals.ZoneManagement">
     <div class="container-fluid">
         <div class="configuration-action-bar row">
-            <div class="col-12 col-md-8 px-0">
+            <div class="col-12 col-md-8">
                 <h5>User Interface Configuration</h5>
             </div>
             <div class="col-12 col-md-4 btn-wrapper">
@@ -69,14 +69,6 @@
                                 </div>
                             </div>
                         </div>
-
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-12">
-                <div class="d-flex justify-content-start">
-                    
-                </div>
             </div>
         </div>
     </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
index c597684a6b..ee8e8220a2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationFormConfigWidget/Default.cshtml
@@ -8,7 +8,7 @@
 @inject IStringLocalizer<GrantManagerResource> L
 @inject IAuthorizationService AuthorizationService
 
-<div class="other-config-scrollable-content">
+<div class="other-config-scrollable-content container-fluid">
 <form id="otherConfigForm" autocomplete="off">
     <div class="configuration-action-bar row">
         <div class="col-12 col-md-8">
@@ -21,7 +21,7 @@
                         class="btn unt-btn-primary btn-primary"
                         abp-tooltip="Save Other Configuration"
                         button-type="Primary" />
-            <button type="reset"
+            <button type="button"
                     id="btn-cancel-other-config"
                     class="btn unt-btn-outline-primary btn-outline-primary"
                     abp-tooltip="Cancel changes">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
index cb3c56e011..03e84b9a4f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.cshtml
@@ -6,7 +6,7 @@
 }
 
 <div class="configuration-action-bar row">
-    <div class="col-12 col-md-8 px-0">
+    <div class="col-12 col-md-8">
         <h5>Scoresheet & Worksheets Configuration</h5>
     </div>
     <div class="col-12 col-md-4 btn-wrapper">
@@ -17,7 +17,7 @@
                     icon="fl fl-save"
                     class="btn unt-btn-primary btn-primary"
                     style="pointer-events: all;"
-                    abp-tooltip="Save the Worksheet associations to the Mapping of to the Available Unity Worksheet Fields"
+                    abp-tooltip="Save the worksheet associations for mapping to the available Unity worksheet fields"
                     button-type="Primary"
                     form="worksheet-config-form" />
         <abp-button id="btn-back-worksheet-config"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
index 6e90f856ee..d3a0219eaf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/PaymentConfiguration/Default.cshtml
@@ -15,13 +15,13 @@
 
 <form id="PaymentThresholdForm" class="payment-configuration-container px-3 pb-2">
     <div class="configuration-action-bar row">
-        <div class="col-12 col-md-8 px-0">
+        <div class="col-12 col-md-8">
             <h5>Payment Configuration</h5>
         </div>
         <div class="col-12 col-md-4 btn-wrapper">
             <abp-button id="btn-save-payment-configuration"
                         text="Save"
-                        type="submit"
+                        type="button"
                         icon-type="Other"
                         icon="fl fl-save"
                         class="btn unt-btn-primary btn-primary"
@@ -36,7 +36,7 @@
     <div class="payment-configuration-scroll flex-grow-1">
         <fieldset name="Unity_GrantManager_ApplicationForms_Mapping_PaymentConfiguration" 
             class="unity-zone" @(Model.HasEditFormPaymentConfiguration ? string.Empty : "disabled")>
-            <legend class="h6 ps-1 pb-2 pt-2 mt-3 fw-bold d-none">Payment Configuration</legend>
+            <legend class="h6 ps-1 pb-2 pt-2 mt-3 fw-bold visually-hidden">Payment Configuration</legend>
     <div>
         <abp-row class="m-0 payment-configuration-form">
             <abp-column size="_12" class="px-0">
@@ -141,9 +141,5 @@
         </abp-row>
     </div>
         </fieldset>
-        <div class="d-flex justify-content-start">
-            
-        </div>
     </div>
-    
 </form>
\ No newline at end of file

From 276106aa9facdce96c8bb234ba01c3c1b4f49db1 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Mon, 22 Jun 2026 16:43:46 -0700
Subject: [PATCH 05/23] [AB#33086] Add Fiscal Year End calculation and
 localization

---
 .../Localization/GrantManager/en.json         |  1 +
 .../Components/ApplicantInfo/Default.cshtml   | 10 ++++-
 .../Components/ApplicantInfo/Default.js       | 41 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 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 a449490f7e..073b7f13cd 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
@@ -429,6 +429,7 @@
     "ApplicantInfoView:ApplicantInfo.UnityApplicant": "Applicant Id",
     "ApplicantInfoView:ApplicantInfo.FiscalMonth": "Fiscal Year End Month",
     "ApplicantInfoView:ApplicantInfo.FiscalDay": "Fiscal Year End Day",
+    "ApplicantInfoView:ApplicantInfo.FiscalYearEnd": "Fiscal Year End",
     "ApplicantInfoView:ApplicantInfo.IndigenousOrgInd": "Indigenous",
     "ApplicantInfoView:ApplicantInfo.Sector": "Sector",
     "ApplicantInfoView:ApplicantInfo.SubSector": "Sub-sector",
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
index e08ed86e60..1be46ee77b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
@@ -158,15 +158,21 @@
 
                 <abp-row class="m-0 p-0">
                     <abp-column size="_4" class="px-1">
-                        <abp-select asp-for="@Model.ApplicantSummary.FiscalDay" asp-items="@Model.FiscalDayList">
+                        <abp-select asp-for="@Model.ApplicantSummary.FiscalMonth" asp-items="@Model.FiscalMonthList">
                             <option value="">Please choose...</option>
                         </abp-select>
                     </abp-column>
                     <abp-column size="_4" class="px-1">
-                        <abp-select asp-for="@Model.ApplicantSummary.FiscalMonth" asp-items="@Model.FiscalMonthList">
+                        <abp-select asp-for="@Model.ApplicantSummary.FiscalDay" asp-items="@Model.FiscalDayList">
                             <option value="">Please choose...</option>
                         </abp-select>
                     </abp-column>
+                    <abp-column size="_4" class="px-1">
+                        <div class="mb-3">
+                            <label class="form-label" for="ApplicantSummary_FiscalYearEnd">@L["ApplicantInfoView:ApplicantInfo.FiscalYearEnd"]</label>
+                            <input type="text" id="ApplicantSummary_FiscalYearEnd" class="form-control" readonly />
+                        </div>
+                    </abp-column>
                 </abp-row>
                 <abp-row class="m-0 p-0">
                     <abp-column size="_4" class="px-1">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
index 8cf4737d2c..7900ee7b86 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
@@ -679,6 +679,41 @@ function registerElectoralDistrictControls($container) {
     });
 }
 
+function calculateFiscalYearEnd($container) {
+    const monthVal = $container.find('#ApplicantSummary_FiscalMonth').val();
+    const dayVal = $container.find('#ApplicantSummary_FiscalDay').val();
+    const $yearEndField = $container.find('#ApplicantSummary_FiscalYearEnd');
+
+    if (!monthVal || !dayVal) {
+        $yearEndField.val('');
+        return;
+    }
+
+    const monthMap = {
+        'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4,
+        'May': 5, 'Jun': 6, 'Jul': 7, 'Aug': 8,
+        'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12
+    };
+
+    const month = monthMap[monthVal];
+    const day = parseInt(dayVal, 10);
+
+    if (!month || isNaN(day)) {
+        $yearEndField.val('');
+        return;
+    }
+
+    const today = new Date();
+    let year = today.getFullYear();
+    if (new Date(year, month - 1, day) < today) {
+        year += 1;
+    }
+
+    const mm = String(month).padStart(2, '0');
+    const dd = String(day).padStart(2, '0');
+    $yearEndField.val(`${year}-${mm}-${dd}`);
+}
+
 function registerApplicantInfoSummaryDropdowns($container) {
     $container.find('#ApplicantSummary_Sector').on('change', function () {
         const selectedValue = $(this).val();
@@ -722,6 +757,12 @@ function registerApplicantInfoSummaryDropdowns($container) {
             $container.find('#ApplicantSummary_BusinessNumber').val(business_number.text).trigger('change');
         });
     });
+
+    $container.find('#ApplicantSummary_FiscalMonth, #ApplicantSummary_FiscalDay').on('change', function () {
+        calculateFiscalYearEnd($container);
+    });
+
+    calculateFiscalYearEnd($container);
 }
 
 function getAttributeObjectByType(type, attributes) {

From 26db08dc8bbfac3b5596662aa297a2a389d134a7 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 06:30:39 -0700
Subject: [PATCH 06/23] [AB#33086] Add Fiscal Year End calculation for
 applicant page

---
 .../ApplicantOrganizationInfo/Default.cshtml  |  8 ++++
 .../ApplicantOrganizationInfo/Default.js      | 42 +++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
index 129f591e06..0a98358439 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
@@ -160,6 +160,14 @@
                                 <abp-column size="_4" class="px-1">
                                     <abp-select asp-for="FiscalDay" asp-items="Model.FiscalDayList" id="ApplicantOrganizationInfo_FiscalDay" />
                                 </abp-column>
+                                <abp-column size="_4" class="px-1">
+                                    <div class="mb-3">
+                                        <label class="form-label" for="ApplicantSummary_FiscalYearEnd">Fiscal Year End</label>
+                                        <input type="text" id="ApplicantOrganizationInfo_FiscalYearEnd" class="form-control" readonly />
+                                    </div>
+                                </abp-column>
+                            </abp-row>
+                            <abp-row class="m-0 p-0">
                                 <abp-column size="_4" class="px-1">
                                     <abp-input type="date" asp-for="StartedOperatingDate" id="ApplicantOrganizationInfo_StartedOperatingDate" abp-data-datepicker="false" />
                                 </abp-column>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
index fa15f3c53e..b2f743222b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
@@ -35,6 +35,14 @@
 
         zoneForm.init();
 
+        debugger;
+
+        zoneForm.form.find('#ApplicantOrganizationInfo_FiscalMonth, #ApplicantOrganizationInfo_FiscalDay').on('change', function () {
+            calculateApplicantFiscalYearEnd(zoneForm.form);
+        });
+
+        calculateApplicantFiscalYearEnd(zoneForm.form);
+
         saveButton.on('click', async function (event) {
             event.preventDefault();
 
@@ -318,4 +326,38 @@
             populateRegisteredFields('', '', '', '', '');
         });
     }
+    function calculateApplicantFiscalYearEnd($container) {
+        const monthVal = $container.find('#ApplicantOrganizationInfo_FiscalMonth').val();
+        const dayVal = $container.find('#ApplicantOrganizationInfo_FiscalDay').val();
+        const $yearEndField = $container.find('#ApplicantOrganizationInfo_FiscalYearEnd');
+
+        if (!monthVal || !dayVal) {
+            $yearEndField.val('');
+            return;
+        }
+
+        const monthMap = {
+            'Jan': 1, 'Feb': 2, 'Mar': 3, 'Apr': 4,
+            'May': 5, 'Jun': 6, 'Jul': 7, 'Aug': 8,
+            'Sep': 9, 'Oct': 10, 'Nov': 11, 'Dec': 12
+        };
+
+        const month = monthMap[monthVal];
+        const day = parseInt(dayVal, 10);
+
+        if (!month || isNaN(day)) {
+            $yearEndField.val('');
+            return;
+        }
+
+        const today = new Date();
+        let year = today.getFullYear();
+        if (new Date(year, month - 1, day) < today) {
+            year += 1;
+        }
+
+        const mm = String(month).padStart(2, '0');
+        const dd = String(day).padStart(2, '0');
+        $yearEndField.val(`${year}-${mm}-${dd}`);
+    }
 })();

From 0c34c9aa20907463882d9dc64acbabb69a9bfd93 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 06:53:35 -0700
Subject: [PATCH 07/23] [AB#33086] Fiscal Year End - SonarQube Fixes

---
 .../Components/ApplicantInfo/Default.js       | 24 ++++++++++++++---
 .../ApplicantOrganizationInfo/Default.cshtml  |  2 +-
 .../ApplicantOrganizationInfo/Default.js      | 26 ++++++++++++++-----
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
index 7900ee7b86..d7cf7db62d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js
@@ -696,17 +696,33 @@ function calculateFiscalYearEnd($container) {
     };
 
     const month = monthMap[monthVal];
-    const day = parseInt(dayVal, 10);
+    const day = Number.parseInt(dayVal, 10);
 
-    if (!month || isNaN(day)) {
+    if (!month || Number.isNaN(day)) {
         $yearEndField.val('');
         return;
     }
 
     const today = new Date();
-    let year = today.getFullYear();
-    if (new Date(year, month - 1, day) < today) {
+    const todayDate = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    let year = todayDate.getFullYear();
+    const isValidMonthDay = (y) => {
+        const d = new Date(y, month - 1, day);
+        return d.getMonth() === month - 1 && d.getDate() === day;
+    };
+
+    if (!isValidMonthDay(year)) {
+        $yearEndField.val('');
+        return;
+    }
+
+    const candidate = new Date(year, month - 1, day);
+    if (candidate < todayDate) {
         year += 1;
+        if (!isValidMonthDay(year)) {
+            $yearEndField.val('');
+            return;
+        }
     }
 
     const mm = String(month).padStart(2, '0');
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
index 0a98358439..3437137972 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.cshtml
@@ -162,7 +162,7 @@
                                 </abp-column>
                                 <abp-column size="_4" class="px-1">
                                     <div class="mb-3">
-                                        <label class="form-label" for="ApplicantSummary_FiscalYearEnd">Fiscal Year End</label>
+                                        <label class="form-label" for="ApplicantOrganizationInfo_FiscalYearEnd">Fiscal Year End</label>
                                         <input type="text" id="ApplicantOrganizationInfo_FiscalYearEnd" class="form-control" readonly />
                                     </div>
                                 </abp-column>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
index b2f743222b..1ef07dd83e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantOrganizationInfo/Default.js
@@ -35,8 +35,6 @@
 
         zoneForm.init();
 
-        debugger;
-
         zoneForm.form.find('#ApplicantOrganizationInfo_FiscalMonth, #ApplicantOrganizationInfo_FiscalDay').on('change', function () {
             calculateApplicantFiscalYearEnd(zoneForm.form);
         });
@@ -343,17 +341,33 @@
         };
 
         const month = monthMap[monthVal];
-        const day = parseInt(dayVal, 10);
+        const day = Number.parseInt(dayVal, 10);
 
-        if (!month || isNaN(day)) {
+        if (!month || Number.isNaN(day)) {
             $yearEndField.val('');
             return;
         }
 
         const today = new Date();
-        let year = today.getFullYear();
-        if (new Date(year, month - 1, day) < today) {
+        const todayDate = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+        let year = todayDate.getFullYear();
+        const isValidMonthDay = (y) => {
+            const d = new Date(y, month - 1, day);
+            return d.getMonth() === month - 1 && d.getDate() === day;
+        };
+
+        if (!isValidMonthDay(year)) {
+            $yearEndField.val('');
+            return;
+        }
+
+        const candidate = new Date(year, month - 1, day);
+        if (candidate < todayDate) {
             year += 1;
+            if (!isValidMonthDay(year)) {
+                $yearEndField.val('');
+                return;
+            }
         }
 
         const mm = String(month).padStart(2, '0');

From bad27bb9425a15e8e6b98e68a8ce0a639ab111f9 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 07:07:30 -0700
Subject: [PATCH 08/23] [AB#33086] Fiscal Year End Date - Fix Mapping Bug

---
 .../GrantManagerApplicationMapperlyProfile.cs            | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
index b30669f1ee..42f748eee2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
@@ -1,6 +1,7 @@
 using Riok.Mapperly.Abstractions;
 using System;
 using System.Reflection;
+using Unity.AI.Operations;
 using Unity.GrantManager.ApplicantProfile;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
@@ -16,7 +17,6 @@
 using Unity.GrantManager.Integrations;
 using Unity.GrantManager.Locality;
 using Unity.GrantManager.Zones;
-using Unity.AI.Operations;
 using Unity.Payments.Domain.AccountCodings;
 using Unity.Payments.PaymentRequests;
 using Volo.Abp.Mapperly;
@@ -979,6 +979,13 @@ public override void Map(UpdateApplicantSummaryDto source, Applicant destination
         {
             destination.IndigenousOrgInd = GrantManagerMapperlyHelpers.BoolToIndigenousOrgInd(source.IndigenousOrgInd);
         }
+
+        // FiscalDay: DTO is string?, entity is int? — CopyNonDefault skips mismatched
+        // types entirely, so the value is never written without this explicit conversion.
+        if (source.FiscalDay != null)
+        {
+            destination.FiscalDay = int.TryParse(source.FiscalDay, out var d) ? d : null;
+        }
     }
 }
 

From eedd1e7179ade2f48b07b4a2455ebc615c1c4f83 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 07:51:12 -0700
Subject: [PATCH 09/23] [AB#32199] Add Permission-User Matrix page and logic

---
 .../Users/PermissionUserMatrix.cshtml         | 166 ++++++++++++++++++
 .../Users/PermissionUserMatrix.cshtml.cs      |  50 ++++++
 .../Identity/Users/PermissionUserMatrix.js    | 141 +++++++++++++++
 .../src/Pages/Identity/Users/index.js         |   7 +
 .../PermissionRoleMatrixRepository.cs         | 109 ++++++++++++
 5 files changed, 473 insertions(+)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
new file mode 100644
index 0000000000..91e7a466db
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
@@ -0,0 +1,166 @@
+@page
+
+@using Microsoft.Extensions.Localization
+@using Unity.GrantManager.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@using Volo.Abp.MultiTenancy
+
+@model Unity.Identity.Web.Pages.Identity.Users.PermissionUserMatrixModel
+
+@inject ICurrentTenant CurrentTenant
+@inject IPageLayout PageLayout
+@inject IStringLocalizer<GrantManagerResource> L
+
+@tagHelperPrefix th:
+
+@{
+    PageLayout.Content.Title = "Permission-User Matrix";
+    ViewBag.PageTitle = "Permission-User Matrix";
+    int rowCount = 1;
+    int maxDepth = Model.PermissionUserMatrix.Any() ? Model.PermissionUserMatrix.Max(item => item.Depth) : 0;
+    int headerLevel = maxDepth + 1;
+
+    var filteredPermissions = Model.ShowNotDefined
+        ? Model.PermissionUserMatrix.Where(p => !p.IsDefined)
+        : Model.PermissionUserMatrix.Where(p => p.IsDefined);
+}
+
+@section scripts {
+    <th:abp-script src="/Pages/Identity/Users/PermissionUserMatrix.js" />
+    <th:abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />
+}
+
+@section styles {
+    <style>
+        #permissionTableContainer {
+            position: relative;
+            min-height: 200px;
+        }
+        #permissionUserTable {
+            display: none;
+        }
+        .loading-spinner {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            text-align: center;
+        }
+    </style>
+}
+
+<div class="container-fluid px-0">
+    <div class="action-bar p-2 filter-search-action-bar">
+        <div class="unity-page-titlebar">
+            <h4 id="PermissionUserMatrixTitle">Permission-User Matrix - @CurrentTenant.Name</h4>
+        </div>
+        <div class="filter-search-action-bar_search-wrapper">
+            <input type="search" id="search" placeholder="Search" class="tbl-search" aria-label="Search permissions">
+        </div>
+
+        <div class="btn-group" id="app_custom_buttons">
+        </div>
+
+        <div id="dynamicButtonContainerId" class="dynamic-buttons-div button-gap-1"></div>
+    </div>
+    <div class="p-3 pt-0">
+        <div id="permissionTableContainer" class="p-3 pt-0">
+            <div class="loading-spinner">
+                <p>Loading permission matrix...</p>
+            </div>
+            <table id="permissionUserTable" class="table table-bordered" aria-describedby="PermissionUserMatrixTitle">
+                @if (!Model.IsExpanded)
+                {
+                    <thead>
+                        <tr>
+                            <th scope="col">#</th>
+                            <th scope="col">L</th>
+                            <th scope="col">Permission Group</th>
+                            <th scope="col">Permission</th>
+                            <th scope="col">Description</th>
+                            @foreach (var user in Model.Users)
+                            {
+                                <th scope="col" class="user-name" data-user-header="@user.UserId" data-user-name="@user.UserName">@user.DisplayLabel</th>
+                            }
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var permission in filteredPermissions)
+                        {
+                            <tr>
+                                <td>@rowCount.ToString("D2")</td>
+                                @{
+                                    rowCount++;
+                                }
+                                <td>@permission.Depth.ToString("D1")</td>
+                                <td>@permission.GroupName</td>
+                                <td>@permission.PermissionName</td>
+                                <td>@(L[permission.PermissionDisplayName].Value)</td>
+                                @foreach (var user in Model.Users)
+                                {
+                                    var hasPermission = permission.UserPermissions.TryGetValue(user.UserId, out var val) && val;
+                                    <td>@(hasPermission ? "TRUE" : string.Empty)</td>
+                                }
+                            </tr>
+                        }
+                    </tbody>
+                }
+                else
+                {
+                    <thead>
+                        <tr>
+                            <th scope="col" rowspan="2" data-dt-order="disable">#</th>
+                            <th scope="col" rowspan="2" data-dt-order="disable">L</th>
+                            <th scope="col" rowspan="2">Permission Group</th>
+                            <th scope="colgroup" colspan="@headerLevel" data-dt-order="disable">Permission</th>
+                            <th scope="col" rowspan="2">Description</th>
+                            @foreach (var user in Model.Users)
+                            {
+                                <th scope="col" rowspan="2" class="user-name" data-user-header="@user.UserId" data-user-name="@user.UserName">@user.DisplayLabel</th>
+                            }
+                        </tr>
+                        <tr>
+                            @for (int groupLevel = 1; groupLevel < headerLevel + 1; groupLevel++)
+                            {
+                                <th scope="col">Level @groupLevel</th>
+                            }
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (var permission in filteredPermissions)
+                        {
+                            <tr>
+                                <td>
+                                    @rowCount.ToString("D2")
+                                </td>
+                                @{
+                                    rowCount++;
+                                }
+                                <td>@permission.Depth.ToString("D1")</td>
+                                <td>@permission.GroupName</td>
+                                @for (int i = 0; i < permission.Depth; i++)
+                                {
+                                    <td></td>
+                                }
+
+                                <td>@permission.PermissionName</td>
+
+                                @for (int j = permission.Depth; j < maxDepth; j++)
+                                {
+                                    <td></td>
+                                }
+
+                                <td>@permission.PermissionDisplayName</td>
+
+                                @foreach (var user in Model.Users)
+                                {
+                                    var hasPermission = permission.UserPermissions.TryGetValue(user.UserId, out var val) && val;
+                                    <td>@(hasPermission ? "TRUE" : string.Empty)</td>
+                                }
+                            </tr>
+                        }
+                    </tbody>
+                }
+            </table>
+        </div>
+    </div>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
new file mode 100644
index 0000000000..853f145afc
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Repositories;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Localization;
+
+namespace Unity.Identity.Web.Pages.Identity.Users;
+
+public class PermissionUserMatrixModel(IPermissionRoleMatrixRepository repository, IPermissionDefinitionManager permissionDefinitionManager) : AbpPageModel
+{
+    public bool IsExpanded { get; private set; }
+    public bool ShowNotDefined { get; private set; } = false;
+    public required IList<PermissionUserMatrixRowDto> PermissionUserMatrix { get; set; }
+    public required IList<UserInfoDto> Users { get; set; }
+
+    public async Task OnGetAsync()
+    {
+        IsExpanded = Request.Query["Render"].ToString().Equals("Expanded", StringComparison.OrdinalIgnoreCase);
+        ShowNotDefined = Request.Query["Show"].ToString().Equals("NotDefined", StringComparison.OrdinalIgnoreCase);
+
+        var result = await repository.GetPermissionUserMatrixAsync();
+        PermissionUserMatrix = result.Rows;
+        Users = result.Users;
+
+        var definedPermissionSet = await permissionDefinitionManager.GetPermissionsAsync();
+        var definedPermissionNames = new HashSet<string>(definedPermissionSet.Select(x => x.Name));
+
+        foreach (var item in PermissionUserMatrix)
+        {
+            item.IsDefined = definedPermissionNames.Contains(item.PermissionName);
+
+            var displayName = item.PermissionDisplayName;
+            if (displayName.Length > 2 && displayName.StartsWith("L:"))
+            {
+                var parts = displayName.AsSpan(2).ToString().Split(',');
+                if (parts.Length == 2)
+                {
+                    var resourceName = parts[0];
+                    var name = parts[1];
+                    var localizable = new LocalizableString(name, resourceName);
+                    var localized = await localizable.LocalizeAsync(StringLocalizerFactory);
+                    item.PermissionDisplayName = localized?.Value ?? displayName;
+                }
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
new file mode 100644
index 0000000000..b771d9314a
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
@@ -0,0 +1,141 @@
+$(document).ready(function () {
+    const urlParams = new URLSearchParams(globalThis.location.search);
+    const isExpanded = urlParams.get('Render') === 'Expanded';
+    const exportTitle = `${abp.currentTenant.name}_${(new Date()).toISOString().slice(0, 10)}_Permission-User Matrix`;
+
+    const currentUserName = abp.currentUser.userName;
+
+    let _permissionsModal = new abp.ModalManager(
+        abp.appPath + 'AbpPermissionManagement/PermissionManagementModal'
+    );
+    _permissionsModal.onClose(function () {
+        globalThis.location.reload();
+    });
+
+    const userColumnIndexes = [];
+    $('#permissionUserTable th[data-user-header]').each(function () {
+        userColumnIndexes.push($(this).index());
+    });
+
+    const columnDefs = [
+        {
+            targets: 0,
+            orderable: true,
+            className: 'notexport'
+        }
+    ];
+
+    if (userColumnIndexes.length > 0) {
+        columnDefs.push({
+            targets: userColumnIndexes,
+            orderable: false
+        });
+    }
+
+    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
+    let localTable = $('#permissionUserTable').DataTable({
+        paging: false,
+        searching: true,
+        ordering: true,
+        fixedHeader: {
+            header: true,
+            footer: false,
+            headerOffset: 0
+        },
+        scrollX: true,
+        scrollCollapse: true,
+        dom: 'Blfrtip',
+        columnDefs: columnDefs,
+        buttons: [
+            {
+                text: isExpanded
+                    ? '<i class="fl fl-back-to-window align-middle"></i> <span>View Simple</span>'
+                    : '<i class="fl fl-fullscreen align-middle"></i> <span>View Expanded</span>',
+                className: 'btn-light rounded-1',
+                action: function () {
+                    globalThis.location = isExpanded
+                        ? '/Identity/Users/PermissionUserMatrix'
+                        : '/Identity/Users/PermissionUserMatrix?Render=Expanded';
+                }
+            },
+            {
+                extend: 'copy',
+                text: 'Copy',
+                title: exportTitle,
+                className: 'custom-table-btn flex-none btn btn-secondary',
+                exportOptions: {
+                    columns: ':visible:not(.notexport)'
+                }
+            },
+            {
+                extend: 'csv',
+                text: 'Export',
+                title: exportTitle,
+                className: 'custom-table-btn flex-none btn btn-secondary',
+                exportOptions: {
+                    columns: ':visible:not(.notexport)'
+                }
+            }
+        ],
+        createdRow: function (row) {
+            $('td', row).each(function () {
+                const cellText = $(this).text().trim();
+
+                if (cellText === 'TRUE') {
+                    $(this).addClass('bg-success text-dark bg-opacity-25 fw-bold border border-success dt-center');
+                }
+            });
+        },
+        initComplete: function () {
+            const table = this.api();
+
+            // Disable sorting on user columns
+            $('th[data-user-header]').removeClass('sorting').addClass('sorting_disabled');
+
+            const headers = table.columns().header().toArray().map(header => $(header).text().trim());
+
+            // Highlight the current user's column
+            headers.forEach((header, index) => {
+                const $th = $(table.column(index).header());
+                const userName = $th.attr('data-user-name');
+                if (userName && userName.toLowerCase() === currentUserName?.toLowerCase()) {
+                    $th.addClass('text-decoration-underline');
+                    table.column(index).nodes().to$().filter(function () {
+                        return !$(this).text().trim();
+                    }).addClass('bg-light');
+                }
+            });
+        }
+    });
+
+    localTable.buttons().container().prependTo('#dynamicButtonContainerId');
+
+    $('#search').on('input', function () {
+        localTable.search($(this).val()).draw();
+    });
+
+    // Hide spinner and show table after initialization
+    $('.loading-spinner').hide();
+    $('#permissionUserTable').show();
+
+    // Click on user column header → open ABP permissions modal for that user
+    $(document).on('click', 'th[data-user-header]', function () {
+        const userId = $(this).attr('data-user-header');
+        const userName = $(this).attr('data-user-name');
+        _permissionsModal.open({
+            providerName: 'U',
+            providerKey: userId,
+            providerKeyDisplayName: userName
+        });
+    });
+
+    $(document).on('mouseover', 'th[data-user-header]', function () {
+        $(this).css('cursor', 'pointer');
+        if (!$(this).attr('title')) {
+            $(this).attr('title', 'Click to manage permissions for this user');
+        }
+    });
+
+    // Workaround - required until Datatables.net 2.x
+    $('th[data-user-header]').removeClass('sorting').addClass('sorting_disabled');
+});
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
index ca1c07d2ed..df617ca021 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
@@ -224,6 +224,13 @@ $(function () {
 
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let actionButtons = [
+        {
+            text: '<i class="fl fl-multi-select align-middle"></i><span>View User Matrix</span>',
+            className: 'btn-light rounded-1',
+            action: function (e, dt, button, config) {
+                globalThis.location = '/Identity/Users/PermissionUserMatrix';
+            }
+        },
         {
             text: '<i class="fl fl-add-to align-middle"></i> <span>' + lg('Common:Command:Create') + '</span>',
             titleAttr: lg('Common:Command:Create'),
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
index ff51136204..92f4db9f4e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
@@ -69,11 +69,97 @@ private static int CalculatePermissionDepth(string permissionName, List<Permissi
         // Recursively calculate the depth of the parent permission
         return 1 + CalculatePermissionDepth(parentPermission, permissions);
     }
+
+    public async Task<PermissionUserMatrixResult> GetPermissionUserMatrixAsync()
+    {
+        var dbContext = await GetDbContextAsync();
+
+        var permissions = await dbContext.Set<PermissionDefinitionRecord>()
+            .Where(p => p.IsEnabled && p.MultiTenancySide != MultiTenancySides.Host)
+            .ToListAsync();
+
+        var permissionGrants = await dbContext.Set<PermissionGrant>()
+            .Where(pg => pg.TenantId == CurrentTenant.Id)
+            .ToListAsync();
+
+        var users = await dbContext.Set<IdentityUser>()
+            .Where(u => u.IsActive && !u.IsDeleted && u.TenantId == CurrentTenant.Id)
+            .OrderBy(u => u.Surname ?? u.UserName)
+            .ToListAsync();
+
+        var userIds = users.Select(u => u.Id).ToHashSet();
+
+        var userRoles = await dbContext.Set<IdentityUserRole>()
+            .Where(ur => userIds.Contains(ur.UserId))
+            .ToListAsync();
+
+        var roles = await dbContext.Set<IdentityRole>()
+            .ToListAsync();
+
+        var roleIdToName = roles.ToDictionary(r => r.Id, r => r.Name);
+
+        // Build a lookup: userId → set of role names
+        var userRoleNames = userRoles
+            .GroupBy(ur => ur.UserId)
+            .ToDictionary(
+                g => g.Key,
+                g => g.Select(ur => roleIdToName.TryGetValue(ur.RoleId, out var name) ? name : null)
+                       .Where(n => n != null)
+                       .ToHashSet()
+            );
+
+        var userInfos = users.Select(u => new UserInfoDto
+        {
+            UserId = u.Id.ToString(),
+            UserName = u.UserName,
+            DisplayLabel = $"{u.Surname}, {u.Name}".Trim() ?? u.UserName
+        }).ToList();
+
+        var rows = permissions
+            .Select(permission => new PermissionUserMatrixRowDto
+            {
+                GroupName = permission.GroupName,
+                PermissionName = permission.Name,
+                PermissionDisplayName = permission.DisplayName,
+                Depth = CalculatePermissionDepth(permission.Name, permissions),
+                UserPermissions = users.ToDictionary(
+                    user => user.Id.ToString(),
+                    user =>
+                    {
+                        // Check for direct user grant
+                        var hasDirectGrant = permissionGrants.Any(pg =>
+                            pg.Name == permission.Name &&
+                            pg.ProviderName == "U" &&
+                            pg.ProviderKey == user.Id.ToString());
+
+                        if (hasDirectGrant) return true;
+
+                        // Check for inherited grant via any of the user's roles
+                        if (!userRoleNames.TryGetValue(user.Id, out var roleNamesForUser))
+                            return false;
+
+                        return permissionGrants.Any(pg =>
+                            pg.Name == permission.Name &&
+                            pg.ProviderName == "R" &&
+                            roleNamesForUser.Contains(pg.ProviderKey, StringComparer.OrdinalIgnoreCase));
+                    })
+            })
+            .OrderBy(p => p.GroupName)
+            .ThenBy(p => p.PermissionName)
+            .ToList();
+
+        return new PermissionUserMatrixResult
+        {
+            Rows = rows,
+            Users = userInfos
+        };
+    }
 }
 
 public interface IPermissionRoleMatrixRepository
 {
     Task<IList<PermissionRoleMatrixDto>> GetPermissionRoleMatrixAsync();
+    Task<PermissionUserMatrixResult> GetPermissionUserMatrixAsync();
 }
 
 public class PermissionRoleMatrixDto
@@ -84,4 +170,27 @@ public class PermissionRoleMatrixDto
     public int Depth { get; set; }
     public required Dictionary<string, bool> RolePermissions { get; set; }
     public bool IsDefined { get; set; } = false;
+}
+
+public class PermissionUserMatrixResult
+{
+    public IList<PermissionUserMatrixRowDto> Rows { get; set; } = [];
+    public IList<UserInfoDto> Users { get; set; } = [];
+}
+
+public class PermissionUserMatrixRowDto
+{
+    public required string GroupName { get; set; }
+    public required string PermissionName { get; set; }
+    public required string PermissionDisplayName { get; set; }
+    public int Depth { get; set; }
+    public required Dictionary<string, bool> UserPermissions { get; set; }
+    public bool IsDefined { get; set; } = false;
+}
+
+public class UserInfoDto
+{
+    public required string UserId { get; set; }
+    public required string UserName { get; set; }
+    public required string DisplayLabel { get; set; }
 }
\ No newline at end of file

From 0bc762a05ae35887c7d0de6d45688faf2a961410 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 08:22:37 -0700
Subject: [PATCH 10/23] [AB#32199] Enhance Permission-User Matrix with role
 display

---
 .../Users/PermissionUserMatrix.cshtml         | 13 +++++--
 .../Identity/Users/PermissionUserMatrix.js    | 24 ++++++++----
 .../PermissionRoleMatrixRepository.cs         | 39 +++++++++++++------
 3 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
index 91e7a466db..d090409c1c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml
@@ -45,6 +45,9 @@
             left: 50%;
             text-align: center;
         }
+        #permissionUserTable .pum-roles { display: none; }
+        #permissionUserTable.show-roles .pum-value { display: none; }
+        #permissionUserTable.show-roles .pum-roles { display: inline; }
     </style>
 }
 
@@ -97,8 +100,9 @@
                                 <td>@(L[permission.PermissionDisplayName].Value)</td>
                                 @foreach (var user in Model.Users)
                                 {
-                                    var hasPermission = permission.UserPermissions.TryGetValue(user.UserId, out var val) && val;
-                                    <td>@(hasPermission ? "TRUE" : string.Empty)</td>
+                                    permission.UserPermissions.TryGetValue(user.UserId, out var summary);
+                                    var hasPermission = summary?.HasPermission ?? false;
+                                    <td class="@(hasPermission ? "pum-has-permission" : "")"><span class="pum-value">@(hasPermission ? "TRUE" : string.Empty)</span>@if (hasPermission) {<span class="pum-roles">@summary!.GrantSources</span>}</td>
                                 }
                             </tr>
                         }
@@ -153,8 +157,9 @@
 
                                 @foreach (var user in Model.Users)
                                 {
-                                    var hasPermission = permission.UserPermissions.TryGetValue(user.UserId, out var val) && val;
-                                    <td>@(hasPermission ? "TRUE" : string.Empty)</td>
+                                    permission.UserPermissions.TryGetValue(user.UserId, out var summary);
+                                    var hasPermission = summary?.HasPermission ?? false;
+                                    <td class="@(hasPermission ? "pum-has-permission" : "")"><span class="pum-value">@(hasPermission ? "TRUE" : string.Empty)</span>@if (hasPermission) {<span class="pum-roles">@summary!.GrantSources</span>}</td>
                                 }
                             </tr>
                         }
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
index b771d9314a..f35e965dbb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
@@ -32,6 +32,8 @@ $(document).ready(function () {
         });
     }
 
+    let showingRoles = false;
+
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let localTable = $('#permissionUserTable').DataTable({
         paging: false,
@@ -47,6 +49,20 @@ $(document).ready(function () {
         dom: 'Blfrtip',
         columnDefs: columnDefs,
         buttons: [
+            {
+                text: '<i class="fl fl-review-user align-middle"></i> <span>View Expanded</span> <span>Show Roles</span>',
+                className: 'btn-light rounded-1',
+                action: function (e, dt, button) {
+                    showingRoles = !showingRoles;
+                    if (showingRoles) {
+                        $('#permissionUserTable').addClass('show-roles');
+                        $(button).find('span').text('Hide Roles');
+                    } else {
+                        $('#permissionUserTable').removeClass('show-roles');
+                        $(button).find('span').text('Show Roles');
+                    }
+                }
+            },
             {
                 text: isExpanded
                     ? '<i class="fl fl-back-to-window align-middle"></i> <span>View Simple</span>'
@@ -78,13 +94,7 @@ $(document).ready(function () {
             }
         ],
         createdRow: function (row) {
-            $('td', row).each(function () {
-                const cellText = $(this).text().trim();
-
-                if (cellText === 'TRUE') {
-                    $(this).addClass('bg-success text-dark bg-opacity-25 fw-bold border border-success dt-center');
-                }
-            });
+            $('td.pum-has-permission', row).addClass('bg-success text-dark bg-opacity-25 fw-bold border border-success dt-center');
         },
         initComplete: function () {
             const table = this.api();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
index 92f4db9f4e..24dcf08913 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
@@ -126,22 +126,31 @@ public async Task<PermissionUserMatrixResult> GetPermissionUserMatrixAsync()
                     user => user.Id.ToString(),
                     user =>
                     {
-                        // Check for direct user grant
+                        var sources = new List<string>();
+
                         var hasDirectGrant = permissionGrants.Any(pg =>
                             pg.Name == permission.Name &&
                             pg.ProviderName == "U" &&
                             pg.ProviderKey == user.Id.ToString());
 
-                        if (hasDirectGrant) return true;
-
-                        // Check for inherited grant via any of the user's roles
-                        if (!userRoleNames.TryGetValue(user.Id, out var roleNamesForUser))
-                            return false;
-
-                        return permissionGrants.Any(pg =>
-                            pg.Name == permission.Name &&
-                            pg.ProviderName == "R" &&
-                            roleNamesForUser.Contains(pg.ProviderKey, StringComparer.OrdinalIgnoreCase));
+                        if (hasDirectGrant)
+                        {
+                            sources.Add("DIRECT");
+                        }
+
+                        if (userRoleNames.TryGetValue(user.Id, out var roleNamesForUser))
+                        {
+                            sources.AddRange(roleNamesForUser.Where(rn => rn != null).Where(roleName => permissionGrants.Any(pg =>
+                                    pg.Name == permission.Name &&
+                                    pg.ProviderName == "R" &&
+                                    pg.ProviderKey.Equals(roleName, StringComparison.OrdinalIgnoreCase))).Select(roleName => roleName!));
+                        }
+
+                        return new PermissionGrantSummary
+                        {
+                            HasPermission = sources.Count > 0,
+                            GrantSources = string.Join(", ", sources)
+                        };
                     })
             })
             .OrderBy(p => p.GroupName)
@@ -184,10 +193,16 @@ public class PermissionUserMatrixRowDto
     public required string PermissionName { get; set; }
     public required string PermissionDisplayName { get; set; }
     public int Depth { get; set; }
-    public required Dictionary<string, bool> UserPermissions { get; set; }
+    public required Dictionary<string, PermissionGrantSummary> UserPermissions { get; set; }
     public bool IsDefined { get; set; } = false;
 }
 
+public class PermissionGrantSummary
+{
+    public bool HasPermission { get; set; }
+    public string GrantSources { get; set; } = string.Empty;
+}
+
 public class UserInfoDto
 {
     public required string UserId { get; set; }

From 6f1dca7a2c148991baf68e12eaff12861bdd23bd Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 08:33:56 -0700
Subject: [PATCH 11/23] [AB#32199] Implement table layout adjustment on resize

---
 .../Identity/Roles/PermissionRoleMatrix.js      | 15 +++++++++++++++
 .../Identity/Users/PermissionUserMatrix.js      | 17 +++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
index 8ad60b312f..7a339cb5fb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
@@ -34,6 +34,16 @@
         });
     }
 
+    const adjustTableLayout = function () {
+        globalThis.requestAnimationFrame(function () {
+            localTable.columns.adjust();
+
+            if (localTable.fixedHeader) {
+                localTable.fixedHeader.adjust();
+            }
+        });
+    };
+
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let localTable = $('#permissionTable').DataTable({
         paging: false,
@@ -122,6 +132,11 @@
     // Hide spinner and show table after initialization
     $('.loading-spinner').hide();
     $('#permissionTable').show();
+    adjustTableLayout();
+
+    $(globalThis).on('resize', function () {
+        adjustTableLayout();
+    });
 
     // Add click handlers to role column headers using data-role-header attribute
     $(document).on('click', 'th[data-role-header]', function () {
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
index f35e965dbb..0f12ee69dd 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
@@ -34,6 +34,16 @@ $(document).ready(function () {
 
     let showingRoles = false;
 
+    const adjustTableLayout = function () {
+        globalThis.requestAnimationFrame(function () {
+            localTable.columns.adjust();
+
+            if (localTable.fixedHeader) {
+                localTable.fixedHeader.adjust();
+            }
+        });
+    };
+
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let localTable = $('#permissionUserTable').DataTable({
         paging: false,
@@ -61,6 +71,8 @@ $(document).ready(function () {
                         $('#permissionUserTable').removeClass('show-roles');
                         $(button).find('span').text('Show Roles');
                     }
+
+                    adjustTableLayout();
                 }
             },
             {
@@ -127,6 +139,11 @@ $(document).ready(function () {
     // Hide spinner and show table after initialization
     $('.loading-spinner').hide();
     $('#permissionUserTable').show();
+    adjustTableLayout();
+
+    $(globalThis).on('resize', function () {
+        adjustTableLayout();
+    });
 
     // Click on user column header → open ABP permissions modal for that user
     $(document).on('click', 'th[data-user-header]', function () {

From 07f138443f3d70feb90aa1cbca5bcf6bad5662d7 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 09:04:50 -0700
Subject: [PATCH 12/23] [AB#32199] Refactor Permission-User Matrix for export
 options

---
 .../Identity/Roles/PermissionRoleMatrix.js    |  6 ++--
 .../Identity/Users/PermissionUserMatrix.js    | 30 ++++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
index 7a339cb5fb..f1465aa9d9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.js
@@ -1,5 +1,5 @@
 $(document).ready(function () {
-    const urlParams = new URLSearchParams(window.location.search);
+    const urlParams = new URLSearchParams(globalThis.location.search);
     const isExpanded = urlParams.get('Render') === 'Expanded';
     const exportTitle = `${abp.currentTenant.name}_${(new Date()).toISOString().slice(0, 10)}_Permission-Role Matrix`;
 
@@ -11,7 +11,7 @@
     );
     _permissionsModal.onClose(function () {
         // Refresh the page to show updated permissions
-        window.location.reload();
+        globalThis.location.reload();
     });
 
     const roleColumnIndexes = [];
@@ -65,7 +65,7 @@
                     : '<i class="fl fl-fullscreen align-middle"></i> <span>View Expanded</span>',
                 className: 'btn-light rounded-1',
                 action: function (e, dt, button, config) {
-                    window.location = isExpanded
+                    globalThis.location = isExpanded
                         ? '/Identity/Roles/PermissionRoleMatrix'
                         : '/Identity/Roles/PermissionRoleMatrix?Render=Expanded';
                 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
index 0f12ee69dd..a6a88df72b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
@@ -32,6 +32,26 @@ $(document).ready(function () {
         });
     }
 
+    const exportOptions = {
+        columns: ':visible:not(.notexport)',
+        format: {
+            body: function (data, row, column, node) {
+                if (!node) {
+                    return data;
+                }
+
+                const $cell = $(node).clone();
+                if (showingRoles) {
+                    $cell.find('.pum-value').remove();
+                } else {
+                    $cell.find('.pum-roles').remove();
+                }
+
+                return $cell.text().trim();
+            }
+        }
+    };
+
     let showingRoles = false;
 
     const adjustTableLayout = function () {
@@ -60,7 +80,7 @@ $(document).ready(function () {
         columnDefs: columnDefs,
         buttons: [
             {
-                text: '<i class="fl fl-review-user align-middle"></i> <span>View Expanded</span> <span>Show Roles</span>',
+                text: '<i class="fl fl-review-user align-middle"></i> <span>Show Roles</span>',
                 className: 'btn-light rounded-1',
                 action: function (e, dt, button) {
                     showingRoles = !showingRoles;
@@ -91,18 +111,14 @@ $(document).ready(function () {
                 text: 'Copy',
                 title: exportTitle,
                 className: 'custom-table-btn flex-none btn btn-secondary',
-                exportOptions: {
-                    columns: ':visible:not(.notexport)'
-                }
+                exportOptions: exportOptions
             },
             {
                 extend: 'csv',
                 text: 'Export',
                 title: exportTitle,
                 className: 'custom-table-btn flex-none btn btn-secondary',
-                exportOptions: {
-                    columns: ':visible:not(.notexport)'
-                }
+                exportOptions: exportOptions
             }
         ],
         createdRow: function (row) {

From c8ad28d2dc94c186ed2953f1ee176556257a0826 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 09:14:31 -0700
Subject: [PATCH 13/23] [AB#32199] Add authorization attributes to Permission
 matrices

---
 .../src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs    | 3 +++
 .../src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
index 6a7ed8a917..dcbd4f01ac 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5,10 +6,12 @@
 using Unity.GrantManager.Repositories;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Identity;
 using Volo.Abp.Localization;
 
 namespace Unity.GrantManager.Web.Pages.Identity.Roles;
 
+[Authorize(IdentityPermissions.Roles.ManagePermissions)]
 public class PermissionRoleMatrixModel(IPermissionRoleMatrixRepository repository, IPermissionDefinitionManager permissionDefinitionManager) : AbpPageModel
 {
     public bool IsExpanded { get; private set; }
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
index 853f145afc..3509cf282b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Authorization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -5,10 +6,12 @@
 using Unity.GrantManager.Repositories;
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Identity;
 using Volo.Abp.Localization;
 
 namespace Unity.Identity.Web.Pages.Identity.Users;
 
+[Authorize(IdentityPermissions.Users.ManagePermissions)]
 public class PermissionUserMatrixModel(IPermissionRoleMatrixRepository repository, IPermissionDefinitionManager permissionDefinitionManager) : AbpPageModel
 {
     public bool IsExpanded { get; private set; }

From f5ade4e43ca5eade01eecec361cce2e2c0475801 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 09:14:45 -0700
Subject: [PATCH 14/23] [AB#32199] Optimize user role retrieval and display
 logic

---
 .../src/Pages/Identity/Users/PermissionUserMatrix.js      | 4 ++--
 .../Unity.Identity.Web/src/Pages/Identity/Users/index.js  | 2 +-
 .../Repositories/PermissionRoleMatrixRepository.cs        | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
index a6a88df72b..614e80242c 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
@@ -86,10 +86,10 @@ $(document).ready(function () {
                     showingRoles = !showingRoles;
                     if (showingRoles) {
                         $('#permissionUserTable').addClass('show-roles');
-                        $(button).find('span').text('Hide Roles');
+                        $(button).find('.toggle-roles-text').text('Hide Roles');
                     } else {
                         $('#permissionUserTable').removeClass('show-roles');
-                        $(button).find('span').text('Show Roles');
+                        $(button).find('.toggle-roles-text').text('Show Roles');
                     }
 
                     adjustTableLayout();
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
index df617ca021..d9efced57d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
@@ -225,7 +225,7 @@ $(function () {
     $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none';
     let actionButtons = [
         {
-            text: '<i class="fl fl-multi-select align-middle"></i><span>View User Matrix</span>',
+            text: '<i class="fl fl-multi-select align-middle"></i> <span>View User Matrix</span>',
             className: 'btn-light rounded-1',
             action: function (e, dt, button, config) {
                 globalThis.location = '/Identity/Users/PermissionUserMatrix';
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
index 24dcf08913..59104a0bb1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Repositories/PermissionRoleMatrixRepository.cs
@@ -93,12 +93,14 @@ public async Task<PermissionUserMatrixResult> GetPermissionUserMatrixAsync()
             .Where(ur => userIds.Contains(ur.UserId))
             .ToListAsync();
 
+        var roleIds = userRoles.Select(ur => ur.RoleId).ToHashSet();
         var roles = await dbContext.Set<IdentityRole>()
+            .Where(r => roleIds.Contains(r.Id))
             .ToListAsync();
 
         var roleIdToName = roles.ToDictionary(r => r.Id, r => r.Name);
 
-        // Build a lookup: userId → set of role names
+        // Build a lookup: userId to set of role names
         var userRoleNames = userRoles
             .GroupBy(ur => ur.UserId)
             .ToDictionary(
@@ -112,7 +114,9 @@ public async Task<PermissionUserMatrixResult> GetPermissionUserMatrixAsync()
         {
             UserId = u.Id.ToString(),
             UserName = u.UserName,
-            DisplayLabel = $"{u.Surname}, {u.Name}".Trim() ?? u.UserName
+            DisplayLabel = string.IsNullOrWhiteSpace(u.Surname) && string.IsNullOrWhiteSpace(u.Name)
+                 ? u.UserName
+                 : $"{u.Surname}, {u.Name}".Trim(' ', ',')
         }).ToList();
 
         var rows = permissions

From 9aaaaeb5a6b0e7544ec6e65aebddd4d910cbe157 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 09:22:22 -0700
Subject: [PATCH 15/23] [AB#32199] Update authorization attributes for role and
 user matrices

---
 .../src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs     | 2 +-
 .../src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
index dcbd4f01ac..1a9b7088aa 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/PermissionRoleMatrix.cshtml.cs
@@ -11,7 +11,7 @@
 
 namespace Unity.GrantManager.Web.Pages.Identity.Roles;
 
-[Authorize(IdentityPermissions.Roles.ManagePermissions)]
+[Authorize(IdentityPermissions.Roles.Default)]
 public class PermissionRoleMatrixModel(IPermissionRoleMatrixRepository repository, IPermissionDefinitionManager permissionDefinitionManager) : AbpPageModel
 {
     public bool IsExpanded { get; private set; }
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
index 3509cf282b..1e838812fe 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml.cs
@@ -11,7 +11,7 @@
 
 namespace Unity.Identity.Web.Pages.Identity.Users;
 
-[Authorize(IdentityPermissions.Users.ManagePermissions)]
+[Authorize(IdentityPermissions.Users.Default)]
 public class PermissionUserMatrixModel(IPermissionRoleMatrixRepository repository, IPermissionDefinitionManager permissionDefinitionManager) : AbpPageModel
 {
     public bool IsExpanded { get; private set; }

From e4f3cb6da8795cce83c212010c4aba9b575c5654 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 09:35:29 -0700
Subject: [PATCH 16/23] [AB#32199] Add authorization checks for buttons and
 code fixes

---
 .../Unity.Identity.Web/src/Pages/Identity/Roles/index.js       | 3 ++-
 .../src/Pages/Identity/Users/PermissionUserMatrix.js           | 2 +-
 .../Unity.Identity.Web/src/Pages/Identity/Users/index.js       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js
index d54abb1091..5c78335ae2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js
@@ -123,8 +123,9 @@ $(function () {
         {
             text: '<i class="fl fl-multi-select align-middle"></i><span>View Role Matrix</span>',
             className: 'btn-light rounded-1',
+            available: () => abp.auth.isGranted('AbpIdentity.Roles'),
             action: function (e, dt, button, config) {
-                window.location = '/Identity/Roles/PermissionRoleMatrix'
+                globalThis.location = '/Identity/Roles/PermissionRoleMatrix'
             }
         },
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
index 614e80242c..e81dda8495 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js
@@ -80,7 +80,7 @@ $(document).ready(function () {
         columnDefs: columnDefs,
         buttons: [
             {
-                text: '<i class="fl fl-review-user align-middle"></i> <span>Show Roles</span>',
+                text: '<i class="fl fl-review-user align-middle"></i> <span class="toggle-roles-text">Show Roles</span>',
                 className: 'btn-light rounded-1',
                 action: function (e, dt, button) {
                     showingRoles = !showingRoles;
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
index d9efced57d..eba6cf5da9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js
@@ -227,6 +227,7 @@ $(function () {
         {
             text: '<i class="fl fl-multi-select align-middle"></i> <span>View User Matrix</span>',
             className: 'btn-light rounded-1',
+            available: () => abp.auth.isGranted('AbpIdentity.Users'),
             action: function (e, dt, button, config) {
                 globalThis.location = '/Identity/Users/PermissionUserMatrix';
             }

From 5aefee2170e0cf256fba80ff9ec3b1f0290811b6 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 10:29:30 -0700
Subject: [PATCH 17/23] [AB#31718] Update button attributes for cancel action

---
 .../Pages/ApplicationForms/Mapping.cshtml                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
index 9506f6ab47..502039731d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml
@@ -283,7 +283,8 @@
                         <abp-button id="btn-cancel-ai-config"
                                     class="btn unt-btn-outline-primary btn-outline-primary mx-1"
                                     icon-type="Other" icon="fl fl-undo"
-                                    abp-tooltip="Cancel changes">Cancel</abp-button>
+                                    text="Cancel"
+                                    abp-tooltip="Cancel changes"></abp-button>
                         <abp-button id="btn-back-ai-config" text="Back"
                                     class="btn unt-btn-outline-primary btn-outline-primary"
                                     abp-tooltip="Navigate back to the Forms" />

From 9825935979b9e404019ec862a462b0f0e65e022d Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 10:39:36 -0700
Subject: [PATCH 18/23] [AB#31718] Update report configuration tab container

---
 .../Shared/Components/ReportingConfiguration/Default.cshtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index f419f5b7a5..34a4989d46 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -7,7 +7,7 @@
 @inject IFeatureChecker FeatureChecker
 @model ReportingConfigurationViewModel
 
-<div class="report-config-component">
+<div class="report-config-component container-fluid">
     <input type="hidden" id="reportingFormId" value="@Model.FormId" />
     <input type="hidden" id="reportingVersionId" value="@Model.SelectedVersionId" />
     <input type="hidden" id="reportingCorrelationId" value="@Model.CorrelationId" />

From 94af01189404450276991b4f06b23a604d883a91 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 23 Jun 2026 12:04:48 -0700
Subject: [PATCH 19/23] [AB#31718] Update button styles for compact action bar

---
 .../Components/ReportingConfiguration/Default.cshtml | 12 ++++++------
 .../Components/ReportingConfiguration/Default.css    |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
index 34a4989d46..f238989357 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml
@@ -73,7 +73,7 @@
                             data-bs-toggle="tooltip"
                             data-bs-placement="top"
                             data-bs-original-title="Generate view"
-                            class="btn unt-btn-primary btn-primary @(Model.HasSavedConfiguration ? "" : "generate-view-btn-hidden")"></abp-button>
+                            class="btn unt-btn-primary btn-primary btn-compact @(Model.HasSavedConfiguration ? "" : "generate-view-btn-hidden")"></abp-button>
 
             }
 
@@ -86,7 +86,7 @@
                             data-bs-toggle="tooltip"
                             data-bs-placement="top"
                             data-bs-original-title="Delete this configuration and associated view"
-                            class="btn unt-btn-danger btn-danger report-config-btn-height-fix @(Model.HasSavedConfiguration ? "" : "delete-config-btn-hidden")"></abp-button>
+                            class="btn unt-btn-danger btn-danger btn-compact @(Model.HasSavedConfiguration ? "" : "delete-config-btn-hidden")"></abp-button>
             }
 
             @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
@@ -98,7 +98,7 @@
                             data-bs-toggle="tooltip"
                             data-bs-placement="top"
                             data-bs-original-title="Save changes"
-                            class="btn unt-btn-primary btn-primary"></abp-button>
+                            class="btn unt-btn-primary btn-primary btn-compact"></abp-button>
             }
 
             <abp-button id="btn-undo-report-configuration"
@@ -108,14 +108,14 @@
                         data-bs-toggle="tooltip"
                         data-bs-placement="top"
                         data-bs-original-title="Cancel changes"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1"
+                        class="btn unt-btn-outline-primary btn-outline-primary btn-compact mx-1"
                         style="display: none;"></abp-button>
 
             @if (await PermissionChecker.IsGrantedAsync(ReportingPermissions.Configuration.Update))
             {
                 <fieldset class="btn-group">
                     <button type="button"
-                            class="btn unt-btn-outline-primary btn-outline-primary dropdown-toggle"
+                                class="btn unt-btn-outline-primary btn-outline-primary dropdown-toggle btn-compact"
                             data-bs-toggle="dropdown"
                             aria-expanded="false">
                         <i class="fl fl-code me-1"></i> JSON
@@ -151,7 +151,7 @@
                         data-bs-toggle="tooltip"
                         data-bs-placement="top"
                         data-bs-original-title="Navigate back to the Forms"
-                        class="btn unt-btn-outline-primary btn-outline-primary mx-1 report-config-btn-height-fix"></abp-button>
+                            class="btn unt-btn-outline-primary btn-outline-primary btn-compact mx-1"></abp-button>
             </div>
         </div>
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
index b21985ce79..aab7f7d7f2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.css
@@ -8,6 +8,10 @@
     margin-bottom: 0.5rem;
 }
 
+    .provider-toggle-section .btn-compact {
+        height: 1.28rem !important;
+    }
+
 
     .provider-toggle-group {
         display: flex;

From f48574ef2cde8bf234c5ef4cd5dec26df7e4d3a5 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Tue, 23 Jun 2026 12:32:02 -0700
Subject: [PATCH 20/23] AB#33493: Fix Sonarqube Issues

---
 .../Components/Scoresheet/Scoresheet.js       | 73 ++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
index 3a248ebb12..5c90f25eb6 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Scoresheet/Scoresheet.js
@@ -1,45 +1,50 @@
-function sanitizeHtml(html) {
-    if (!html) return '';
+const _SANITIZE_ALLOWED_TAGS = new Set([
+    'a', 'b', 'blockquote', 'br', 'code', 'del', 'em',
+    'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
+    'li', 'ol', 'p', 'pre', 's', 'span', 'strong', 'u', 'ul'
+]);
+const _SANITIZE_ALLOWED_ATTRS = new Set(['href', 'rel', 'target', 'title']);
+const _SANITIZE_ALLOWED_SCHEMES = new Set(['http:', 'https:', 'mailto:']);
+const _SANITIZE_STRIP_WITH_CONTENT = new Set(['script', 'style', 'iframe', 'noscript', 'object', 'embed']);
+
+function _isSafeHref(href) {
+    try {
+        const url = new URL(href, location.href);
+        return _SANITIZE_ALLOWED_SCHEMES.has(url.protocol);
+    } catch (e) {
+        console.warn('sanitizeHtml: invalid href removed:', e);
+        return false;
+    }
+}
 
-    const ALLOWED_TAGS = new Set([
-        'a', 'b', 'blockquote', 'br', 'code', 'del', 'em',
-        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
-        'li', 'ol', 'p', 'pre', 's', 'span', 'strong', 'u', 'ul'
-    ]);
-    const ALLOWED_ATTRS = new Set(['href', 'rel', 'target', 'title']);
-    const ALLOWED_SCHEMES = ['http:', 'https:', 'mailto:'];
-    const STRIP_WITH_CONTENT = new Set(['script', 'style', 'iframe', 'noscript', 'object', 'embed']);
+function _sanitizeElement(el) {
+    for (const attr of Array.from(el.attributes)) {
+        if (_SANITIZE_ALLOWED_ATTRS.has(attr.name)) {
+            if (attr.name === 'href' && !_isSafeHref(el.getAttribute('href'))) {
+                el.removeAttribute('href');
+            }
+        } else {
+            el.removeAttribute(attr.name);
+        }
+    }
+}
 
+function sanitizeHtml(html) {
+    if (!html) return '';
     const template = document.createElement('template');
     template.innerHTML = html;
-
     // Process bottom-up so children are handled before their parent is unwrapped/removed
     const elements = Array.from(template.content.querySelectorAll('*')).reverse();
     for (const el of elements) {
         const tag = el.tagName.toLowerCase();
-        if (STRIP_WITH_CONTENT.has(tag)) {
+        if (_SANITIZE_STRIP_WITH_CONTENT.has(tag)) {
             el.remove();
-        } else if (!ALLOWED_TAGS.has(tag)) {
-            el.replaceWith(...Array.from(el.childNodes));
+        } else if (_SANITIZE_ALLOWED_TAGS.has(tag)) {
+            _sanitizeElement(el);
         } else {
-            for (const attr of Array.from(el.attributes)) {
-                if (!ALLOWED_ATTRS.has(attr.name)) {
-                    el.removeAttribute(attr.name);
-                } else if (attr.name === 'href') {
-                    try {
-                        const url = new URL(el.getAttribute('href'), location.href);
-                        if (!ALLOWED_SCHEMES.includes(url.protocol)) {
-                            el.removeAttribute('href');
-                        }
-                    } catch (e) {
-                        console.warn('sanitizeHtml: invalid href removed:', e);
-                        el.removeAttribute('href');
-                    }
-                }
-            }
+            el.replaceWith(...Array.from(el.childNodes));
         }
     }
-
     const wrapper = document.createElement('div');
     wrapper.appendChild(template.content);
     return wrapper.innerHTML;
@@ -47,10 +52,10 @@ function sanitizeHtml(html) {
 
 function escapeHtml(text) {
     return String(text)
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;');
+        .replaceAll('&', '&amp;')
+        .replaceAll('<', '&lt;')
+        .replaceAll('>', '&gt;')
+        .replaceAll('"', '&quot;');
 }
 
 $(function () {

From e92b33c13012aed5b905d4044057d4b6e65ec1d7 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 24 Jun 2026 12:56:03 -0700
Subject: [PATCH 21/23] AB#33087: Add Category Column in Payment List Page

---
 .../PaymentRequests/PaymentRequestDto.cs        |  1 +
 .../Services/PaymentRequestQueryManager.cs      |  5 +++++
 .../Localization/Payments/en.json               |  1 +
 .../Pages/PaymentRequests/Index.js              | 17 ++++++++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
index bdab6921b9..c959af41f9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs
@@ -48,6 +48,7 @@ public class PaymentRequestDto : AuditedEntityDto<Guid>, IMultiTenant
         public string? FsbApNotified { get; set; }
 
         public Guid? ApplicantId { get; set; }
+        public string? Category { get; set; }
         public Guid? TenantId { get; set; }
 
         public static explicit operator PaymentRequestDto(CreatePaymentRequestDto v)
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs
index d0f0ca4d25..0b61ed196f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Domain/Services/PaymentRequestQueryManager.cs
@@ -138,6 +138,7 @@ public async Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsync(List<Paym
 
             var applications = await applicationRepository.GetListByIdsAsync(applicationIds) ?? [];
             var applicantIdByApplicationId = applications.ToDictionary(a => a.Id, a => a.ApplicantId);
+            var categoryByApplicationId = applications.ToDictionary(a => a.Id, a => a.ApplicationForm?.Category);
 
             foreach (var paymentDto in paymentDtos)
             {
@@ -145,6 +146,10 @@ public async Task<List<PaymentRequestDto>> MapToDtoAndLoadDetailsAsync(List<Paym
                 {
                     paymentDto.ApplicantId = applicantId;
                 }
+                if (categoryByApplicationId.TryGetValue(paymentDto.CorrelationId, out var category))
+                {
+                    paymentDto.Category = category;
+                }
             }
 
             // Flatten all DecisionUserIds from ExpenseApprovals across all PaymentRequestDtos
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
index ab89d7c0da..4dcdee5d03 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Shared/Localization/Payments/en.json
@@ -67,6 +67,7 @@
     "ApplicationPaymentListTable:PaymentStatus": "CAS Payment Status",
     "ApplicationPaymentListTable:Note": "Note",
     "ApplicationPaymentListTable:FsbApNotified": "FSB-AP Notified",
+    "ApplicationPaymentListTable:Category": "Category",
 
     "ApplicantInfoView:SupplierInfoTitle": "Supplier Info",
     "ApplicantInfoView:ApplicantInfo:SupplierNumber": "Supplier #",
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
index 7b858aa3cc..fed4e46b91 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js
@@ -27,7 +27,8 @@ $(function () {
         'l2ApprovalDate',
         'l3ApprovalDate',
         'CASResponse',
-        'accountCodingDisplay'
+        'accountCodingDisplay',
+        'category'
     ];
 
     let paymentRequestStatusModal = new abp.ModalManager({
@@ -324,6 +325,7 @@ $(function () {
             getBatchNameColumn(columnIndex++),
             getSubmissionConfirmationCodeColumn(columnIndex++),
             getApplicantNameColumn(columnIndex++),
+            getCategoryColumn(columnIndex++),
             getSupplierNumberColumn(columnIndex++),
             getSupplierNameColumn(columnIndex++),
             getSiteNumberColumn(columnIndex++),
@@ -782,6 +784,19 @@ $(function () {
         };
     }
 
+    function getCategoryColumn(columnIndex) {
+        return {
+            title: l('ApplicationPaymentListTable:Category'),
+            name: 'category',
+            data: 'category',
+            className: 'data-table-header',
+            index: columnIndex,
+            render: function (data) {
+                return data ?? nullPlaceholder;
+            }
+        };
+    }
+
     function getExpenseApprovalsDetails(expenseApprovals, type) {
         return expenseApprovals.find(x => x.type == type);
     }

From ee9f32130ee6350ffe877cd47d4a31757fc729ff Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Wed, 24 Jun 2026 13:42:38 -0700
Subject: [PATCH 22/23] feature/AB#33609-FixSqlLightVulnerability

---
 .../Unity.Flex.Application.Tests.csproj                         | 2 ++
 .../Unity.Notifications.EntityFrameworkCore.Tests.csproj        | 2 ++
 .../Unity.Payments.Application.Tests.csproj                     | 2 ++
 .../Unity.TenantManagement.EntityFrameworkCore.Tests.csproj     | 2 ++
 .../Unity.GrantManager.Domain.Tests.csproj                      | 1 +
 .../Unity.GrantManager.EntityFrameworkCore.Tests.csproj         | 1 +
 6 files changed, 10 insertions(+)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj
index b52b4f9eee..f7a1f763c1 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/test/Unity.Flex.Application.Tests/Unity.Flex.Application.Tests.csproj
@@ -18,6 +18,8 @@
 	  <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj
index 2e9f3f992b..1c140ce8e0 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/test/Unity.Notifications.EntityFrameworkCore.Tests/Unity.Notifications.EntityFrameworkCore.Tests.csproj
@@ -17,6 +17,8 @@
     <ProjectReference Include="..\..\src\Unity.Notifications.EntityFrameworkCore\Unity.Notifications.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Unity.Notifications.TestBase\Unity.Notifications.TestBase.csproj" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj
index e0871d7f80..b935efb804 100644
--- a/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.Payments/test/Unity.Payments.Application.Tests/Unity.Payments.Application.Tests.csproj
@@ -21,6 +21,8 @@
     <ProjectReference Include="..\..\..\Unity.SharedKernel\Unity.SharedKernel.csproj" />
     <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.3.0" />
     <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj
index 6561e399e8..75e6846d56 100644
--- a/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.TenantManagement/test/Unity.TenantManagement.EntityFrameworkCore.Tests/Unity.TenantManagement.EntityFrameworkCore.Tests.csproj
@@ -17,6 +17,8 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.3" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="10.3.0" />
+    <!-- Explicit reference to fix vulnerable transitive dependency -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj b/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj
index 950674c8f6..c2230656c3 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Domain.Tests/Unity.GrantManager.Domain.Tests.csproj
@@ -17,6 +17,7 @@
     <PackageReference Include="Npgsql" Version="10.0.2" />
     <!-- Explicit reference to fix vulnerable transitive dependency -->
     <PackageReference Include="System.IO.Packaging" Version="10.0.7" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj b/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj
index a86e0eca24..0b86c87488 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.EntityFrameworkCore.Tests/Unity.GrantManager.EntityFrameworkCore.Tests.csproj
@@ -17,6 +17,7 @@
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
 		<!-- Explicit reference to fix vulnerable transitive dependency -->
 		<PackageReference Include="System.IO.Packaging" Version="10.0.7" />
+		<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>

From 1387ae6f7be6d222a4e8d19331a8d0d9931cb816 Mon Sep 17 00:00:00 2001
From: Armin Hasanpour <armin.hasanpour@gov.bc.ca>
Date: Wed, 24 Jun 2026 17:39:34 -0700
Subject: [PATCH 23/23] AB#33573 - [UI] "Notifications" page layout issue

---
 .../Localization/Notifications/en.json        |  2 +-
 .../Pages/Notifications/Index.cshtml          | 15 ++++++----
 .../Pages/Notifications/Index.css             | 30 +++++++++++++++++++
 .../Pages/Notifications/Index.js              | 15 ++++++----
 4 files changed, 50 insertions(+), 12 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.css

diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json
index b5b50c62aa..179899deeb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain.Shared/Localization/Notifications/en.json
@@ -24,7 +24,7 @@
     "Filter": "Filter",
     "Export": "Export",
     "NotificationList:NotificationId": "Notification Id",
-    "NotificationList:SubmissionId": "Submission Id",
+    "NotificationList:SubmissionId": "Submission #",
     "NotificationList:ApplicantName": "Applicant Name",
     "NotificationList:SentDate": "Sent Date",
     "NotificationList:Status": "Status",
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml
index 163c82c20d..86f77e3eaf 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml
@@ -10,12 +10,17 @@
     </abp-script-bundle>
 }
 
+@section styles {
+    <abp-style src="/Pages/Notifications/Index.css" />
+}
+
 <div class="container-fluid px-2">
-    <div class="action-bar p-2 search-action-bar d-flex align-items-center gap-2">
-        <abp-card-title class="mb-0">@L["Menu:Notifications"]</abp-card-title>
-        <label for="search" class="visually-hidden">@L["Search"]</label>
-        <input type="search" id="search" class="tbl-search" placeholder="@L["Search"]" aria-label="@L["Search"]" />
-        <span id="dynamicButtonContainerId" class="ms-auto"></span>
+    <div class="action-bar p-2 search-action-bar d-flex align-items-center">
+        <div class="search-action-bar_search-wrapper flex-grow-1">
+            <label for="search" class="visually-hidden">@L["Search"]</label>
+            <input type="search" id="search" class="tbl-search" placeholder="@L["Search"]" aria-label="@L["Search"]" />
+        </div>
+        <span id="dynamicButtonContainerId"></span>
     </div>
     <abp-table id="NotificationListTable"></abp-table>
 </div>
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.css b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.css
new file mode 100644
index 0000000000..6a1faf3a05
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.css
@@ -0,0 +1,30 @@
+/* The shared initializeDataTable helper enables scrollX, and layout.css forces
+   a permanent vertical scrollbar on the scroll body. Together DataTables bakes
+   ~25px of vertical-scrollbar reservation into the computed column widths, so
+   the inner table ends up wider than its container and renders a phantom
+   horizontal scrollbar even when there is free space.
+
+   `width: 100%` alone does nothing here because the table is table-layout: auto,
+   where the columns' content widths win over the width hint. Switching the
+   inner head/body tables to table-layout: fixed makes width: 100% authoritative,
+   so the table matches the container exactly; over-long values (full email
+   addresses) wrap inside their column instead of forcing a horizontal scroll.
+   Restoring overflow-y: auto lets the vertical scrollbar appear only when rows
+   actually overflow, removing the reserved gutter when they fit.
+
+   Scoped to this table so the intentionally wide, horizontally scrolling tables
+   elsewhere are unaffected. */
+#NotificationListTable_wrapper .dt-scroll-head .dt-scroll-headInner {
+    width: 100% !important;
+}
+
+#NotificationListTable_wrapper .dt-scroll-body {
+    overflow-y: auto !important;
+}
+
+#NotificationListTable_wrapper .dt-scroll-head .dt-scroll-headInner table,
+#NotificationListTable_wrapper .dt-scroll-body table,
+#NotificationListTable {
+    table-layout: fixed !important;
+    width: 100% !important;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js
index d1b0f0d7fd..6fa7e8c0d9 100644
--- a/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js
+++ b/applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js
@@ -58,12 +58,12 @@ $(function () {
             getSubmissionIdColumn(columnIndex++),
             getTextColumn(columnIndex++, l('NotificationList:ApplicantName'), 'applicantName'),
             getSentDateColumn(columnIndex++),
-            getTextColumn(columnIndex++, l('NotificationList:Status'), 'status'),
+            getTextColumn(columnIndex++, l('NotificationList:Status'), 'status', { width: '7rem', className: 'data-table-header text-nowrap' }),
             getTextColumn(columnIndex++, l('NotificationList:From'), 'fromAddress'),
             getTextColumn(columnIndex++, l('NotificationList:To'), 'toAddress'),
             getTextColumn(columnIndex++, l('NotificationList:Subject'), 'subject'),
-            getTextColumn(columnIndex++, l('NotificationList:Recipient'), 'recipient'),
-            getTextColumn(columnIndex++, l('NotificationList:EmailType'), 'emailType')
+            getTextColumn(columnIndex++, l('NotificationList:Recipient'), 'recipient', { width: '8rem', className: 'data-table-header text-nowrap' }),
+            getTextColumn(columnIndex++, l('NotificationList:EmailType'), 'emailType', { width: '9rem', className: 'data-table-header text-nowrap' })
         ];
         return columns.map((column) => ({ ...column, targets: [column.index], orderData: [column.index, 0] }));
     }
@@ -84,7 +84,8 @@ $(function () {
             title: l('NotificationList:SubmissionId'),
             name: 'submissionReferenceNo',
             data: 'submissionReferenceNo',
-            className: 'data-table-header',
+            className: 'data-table-header text-nowrap',
+            width: '8rem',
             index: columnIndex,
             render: function (data, type, row) {
                 if (type !== 'display') {
@@ -106,6 +107,7 @@ $(function () {
             name: 'sentDateTime',
             data: 'sentDateTime',
             className: 'data-table-header text-nowrap',
+            width: '8rem',
             index: columnIndex,
             render: function (data, type) {
                 return DateUtils.formatUtcDateToLocal(data, type);
@@ -122,12 +124,13 @@ function responseCallback(result) {
     };
 }
 
-function getTextColumn(columnIndex, title, dataField) {
+function getTextColumn(columnIndex, title, dataField, options = {}) {
     return {
         title: title,
         name: dataField,
         data: dataField,
-        className: 'data-table-header',
+        className: options.className ?? 'data-table-header',
+        ...(options.width ? { width: options.width } : {}),
         index: columnIndex
     };
 }