feature/AB#30415 - Modular Applicant Permissions

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js

@@ -778,7 +778,7 @@ $(function () {
 
                 const safeApplicantName = $.fn.dataTable.render.text().display(applicantName);
 
-                if (type === 'display' && abp.auth.isGranted('GrantApplicationManagement.Applicants.ViewList')) {
+                if (type === 'display' && abp.auth.isGranted('Unity.GrantManager.ApplicantManagement.Applicant')) {
                     const applicantId = row?.applicantId;
                     const isGuid = applicantId && guidPattern.test(applicantId);
 

applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.ApplicantManagement.cs

@@ -0,0 +1,96 @@
+namespace Unity.Modules.Shared;
+
+public static partial class UnitySelector
+{
+    public static partial class ApplicantManagement
+    {
+        public const string Default = "Unity.GrantManager.ApplicantManagement";
+
+
+        public static partial class Applicant
+        {
+            // Default includes View Applicants List
+            public const string Default = "Unity.GrantManager.ApplicantManagement.Applicant";
+            public const string Update  = "Unity.GrantManager.ApplicantManagement.Applicant.Update";
+            public const string Delete  = "Unity.GrantManager.ApplicantManagement.Applicant.Delete";
+            public const string Merge   = "Unity.GrantManager.ApplicantManagement.Applicant.Merge";
+        }
+
+        public static partial class ApplicantInfo
+        {
+            public const string Default         = "Unity.GrantManager.ApplicantManagement.ApplicantInfo";
+            public const string Update          = "Unity.GrantManager.ApplicantManagement.ApplicantInfo.Update";
+            public const string Update_RedStop  = "Unity.GrantManager.ApplicantManagement.ApplicantInfo.Update.RedStop";
+
+            public static partial class OrganizationInfo
+            {
+                public const string Default = "Unity.GrantManager.ApplicantManagement.ApplicantInfo.OrganizationInfo";
+                public const string Update  = "Unity.GrantManager.ApplicantManagement.ApplicantInfo.OrganizationInfo.Update";
+            }
+        }
+
+        public static partial class Contacts
+        {
+            public const string Default = "Unity.GrantManager.ApplicantManagement.Contacts";
+            public const string Create  = "Unity.GrantManager.ApplicantManagement.Contacts.Create";
+            public const string Update  = "Unity.GrantManager.ApplicantManagement.Contacts.Update";
+            public const string Delete  = "Unity.GrantManager.ApplicantManagement.Contacts.Delete";
+        }
+
+        public static partial class Addresses
+        {
+            public const string Default = "Unity.GrantManager.ApplicantManagement.Addresses";
+            public const string Create  = "Unity.GrantManager.ApplicantManagement.Addresses.Create";
+            public const string Update  = "Unity.GrantManager.ApplicantManagement.Addresses.Update";
+            public const string Delete  = "Unity.GrantManager.ApplicantManagement.Addresses.Delete";
+        }
+
+        public static partial class Payments
+        {
+            public const string Default          = "Unity.GrantManager.ApplicantManagement.Payments";
+            public const string EditSupplierInfo = "Unity.GrantManager.ApplicantManagement.Payments.EditSupplierInfo";
+        }
+
+        public static partial class History
+        {
+            public const string Default = "Unity.GrantManager.ApplicantManagement.History";
+
+            public static partial class FundingHistory
+            {
+                public const string Default = "Unity.GrantManager.ApplicantManagement.History.Funding";
+                public const string Update  = "Unity.GrantManager.ApplicantManagement.History.Funding.Update";
+            }
+
+            public static partial class AuditHistory
+            {
+                public const string Default = "Unity.GrantManager.ApplicantManagement.History.Audit";
+                public const string Update  = "Unity.GrantManager.ApplicantManagement.History.Audit.Update";
+            }
+
+            public static partial class IssueHistory
+            {
+                public const string Default = "Unity.GrantManager.ApplicantManagement.History.Issue";
+                public const string Update  = "Unity.GrantManager.ApplicantManagement.History.Issue.Update";
+            }
+
+            public static partial class ReportsHistory
+            {
+                public const string Default = "Unity.GrantManager.ApplicantManagement.History.Report";
+                public const string Update  = "Unity.GrantManager.ApplicantManagement.History.Report.Update";
+            }
+        }
+
+        public static partial class Comments
+        {
+            public const string Default = "Unity.GrantManager.ApplicantManagement.Comments";
+            public const string Create  = "Unity.GrantManager.ApplicantManagement.Comments.Create";
+        }
+
+        public static partial class Attachments
+        {
+            public const string Default   = "Unity.GrantManager.ApplicantManagement.Attachments";
+            public const string Upload    = "Unity.GrantManager.ApplicantManagement.Attachments.Upload";
+            public const string EditLabel = "Unity.GrantManager.ApplicantManagement.Attachments.EditLabel";
+        }
+    }
+}

applications/Unity.GrantManager/modules/Unity.SharedKernel/Constants/UnitySelector.Override.cs

@@ -3,6 +3,14 @@
 [System.Diagnostics.CodeAnalysis.SuppressMessage("Critical Code Smell", "S3218:Inner class members should not shadow outer class \"static\" or type members", Justification = "Constants File")]
 public static partial class UnitySelector
 {
+    public static partial class Applicant
+    {
+        public static partial class Summary // ApplicantInfo
+        {
+            public const string Update_AssignApplicant = "Unity.GrantManager.ApplicationManagement.Applicant.Summary.Update.AssignApplicant";
+        }
+    }
+
     public static partial class Review
     {
         public static partial class Approval

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/ApplicantProfile/History/SaveApplicantHistoryNotesDto.cs

@@ -1,7 +1,10 @@
+using System.Collections.Generic;
+
 namespace Unity.GrantManager.ApplicantProfile;
 
 public class SaveApplicantHistoryNotesDto
 {
+    public List<string> ModifiedFields { get; set; } = [];
     public string? FundingHistoryComments { get; set; }
     public string? IssueTrackingComments { get; set; }
     public string? AuditComments { get; set; }

applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Permissions/GrantApplications/GrantApplicationPermissionDefinitionProvider.cs

@@ -42,19 +42,6 @@ public override void Define(IPermissionDefinitionContext context)
             // Application
             grantApplicationPermissionsGroup.AddPermission(GrantApplicationPermissions.Applications.Default, L("Permission:GrantApplicationManagement.Applications.Default"));
 
-            // Applicant
-            var applicatPermissions = grantApplicationPermissionsGroup.AddPermission(GrantApplicationPermissions.Applicants.Default, L("Permission:GrantApplicationManagement.Applicants.Default"));
-            applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.ViewList, L("Permission:GrantApplicationManagement.Applicants.ViewList"));
-            applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.Edit, L("Permission:GrantApplicationManagement.Applicants.Edit"));
-            applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.AssignApplicant, L("Permission:GrantApplicationManagement.Applicants.AssignApplicant"));
-            applicatPermissions.AddChild(GrantApplicationPermissions.Applicants.Delete, L("Permission:GrantApplicationManagement.Applicants.Delete"));
-            var applicantInfoPermissions = applicatPermissions.AddChild(
-                GrantApplicationPermissions.Applicants.ApplicantInfoDefault,
-                L("Permission:GrantApplicationManagement.Applicants.ApplicantInfo"));
-            applicantInfoPermissions.AddChild(
-                GrantApplicationPermissions.Applicants.EditRedStop,
-                L("Permission:GrantApplicationManagement.Applicants.ApplicantInfo.EditRedStop"));
-
             // Assignment
             var assignmentPermissions = grantApplicationPermissionsGroup.AddPermission(GrantApplicationPermissions.Assignments.Default, L("Permission:GrantApplicationManagement.Assignments.Default"));
             assignmentPermissions.AddChild(GrantApplicationPermissions.Assignments.AssignInitial, L("Permission:GrantApplicationManagement.Assignments.AssignInitial"));
@@ -123,6 +110,9 @@ public override void Define(IPermissionDefinitionContext context)
             var tagsPermissionsGroup = context.AddGroup("Tags", L("Permission:Tags"));
             tagsPermissionsGroup.AddPermission(UnitySelector.Application.Tags.Create, L(UnitySelector.Application.Tags.Create));
             tagsPermissionsGroup.AddPermission(UnitySelector.Application.Tags.Delete, L(UnitySelector.Application.Tags.Delete));
+
+            //-- GRANT APPLICANT MANAGEMENT PERMISSIONS
+            context.AddGrantApplicantManagement_Permissions();
         }
 
         private static LocalizableString L(string name)
@@ -178,6 +168,7 @@ public static void AddApplication_ApplicantInfo_Permissions(this PermissionGroup
 
             var upx_Applicant_Summary                           = upx_Applicant.AddUnityChild(UnitySelector.Applicant.Summary.Default);
             var upx_Applicant_Summary_Update                    = upx_Applicant_Summary.AddUnityChild(UnitySelector.Applicant.Summary.Update);
+            var upx_Applicant_Summary_Update_Assign             = upx_Applicant_Summary_Update.AddUnityChild(UnitySelector.Applicant.Summary.Update_AssignApplicant);
 
             var upx_Applicant_Contact                           = upx_Applicant.AddUnityChild(UnitySelector.Applicant.Contact.Default);
             var upx_Applicant_Contact_Create                    = upx_Applicant_Contact.AddUnityChild(UnitySelector.Applicant.Contact.Create);
@@ -195,6 +186,39 @@ public static void AddApplication_ApplicantInfo_Permissions(this PermissionGroup
             #endregion
         }
 
+        public static void AddGrantApplicantManagement_Permissions(this IPermissionDefinitionContext context)
+        {
+            #region APPLICANT MANAGEMENT GRANULAR PERMISSIONS
+            var group = context.AddGroup(UnitySelector.ApplicantManagement.Default, L("Permission:GrantApplicantManagement"));
+
+            var upx_Applicant = group.AddPermission(UnitySelector.ApplicantManagement.Applicant.Default, L(UnitySelector.ApplicantManagement.Applicant.Default));
+            upx_Applicant.AddUnityChild(UnitySelector.ApplicantManagement.Applicant.Update);
+            upx_Applicant.AddUnityChild(UnitySelector.ApplicantManagement.Applicant.Delete);
+            upx_Applicant.AddUnityChild(UnitySelector.ApplicantManagement.Applicant.Merge);
+
+            var upx_ApplicantInfo = group.AddPermission(UnitySelector.ApplicantManagement.ApplicantInfo.Default, L(UnitySelector.ApplicantManagement.ApplicantInfo.Default));
+            var upx_ApplicantInfo_Update = upx_ApplicantInfo.AddUnityChild(UnitySelector.ApplicantManagement.ApplicantInfo.Update);
+            upx_ApplicantInfo_Update.AddUnityChild(UnitySelector.ApplicantManagement.ApplicantInfo.Update_RedStop);
+            upx_ApplicantInfo.AddUnityChild(UnitySelector.ApplicantManagement.ApplicantInfo.OrganizationInfo.Update);
+
+
+            var upx_Contacts = group.AddPermission(UnitySelector.ApplicantManagement.Contacts.Default, L(UnitySelector.ApplicantManagement.Contacts.Default));
+            upx_Contacts.AddUnityChild(UnitySelector.ApplicantManagement.Contacts.Update);
+
+
+            var upx_Addresses = group.AddPermission(UnitySelector.ApplicantManagement.Addresses.Default, L(UnitySelector.ApplicantManagement.Addresses.Default));
+            upx_Addresses.AddUnityChild(UnitySelector.ApplicantManagement.Addresses.Update);
+
+            var upx_Payments = group.AddPermission(UnitySelector.ApplicantManagement.Payments.Default, L(UnitySelector.ApplicantManagement.Payments.Default));
+
+            var upx_History = group.AddPermission(UnitySelector.ApplicantManagement.History.Default, L(UnitySelector.ApplicantManagement.History.Default));
+            upx_History.AddUnityChild(UnitySelector.ApplicantManagement.History.FundingHistory.Update);
+            upx_History.AddUnityChild(UnitySelector.ApplicantManagement.History.AuditHistory.Update);
+            upx_History.AddUnityChild(UnitySelector.ApplicantManagement.History.IssueHistory.Update);
+            upx_History.AddUnityChild(UnitySelector.ApplicantManagement.History.ReportsHistory.Update);
+            #endregion
+        }
+
         public static PermissionDefinition AddUnityChild(this PermissionDefinition parent, string name)
         {
             return parent.AddChild(name, LocalizableString.Create<GrantManagerResource>(name));

applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AppServices/ApplicantContactAppService.cs

@@ -1,6 +1,6 @@
+using Microsoft.AspNetCore.Authorization;
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
 using Unity.GrantManager.ApplicantProfile.ProfileData;
 using Unity.GrantManager.Contacts;
 using Unity.Modules.Shared;
@@ -21,14 +21,14 @@ public class ApplicantContactAppService(
     private const string ApplicantEntityType = "Applicant";
 
     /// <inheritdoc />
-    [Authorize(UnitySelector.Applicant.Contact.Default)]
+    [Authorize(UnitySelector.ApplicantManagement.Contacts.Default)]
     public virtual Task<ApplicantContactInfoDto> GetByApplicantIdAsync(Guid applicantId)
     {
         return applicantContactQueryService.GetByApplicantIdAsync(applicantId);
     }
 
     /// <inheritdoc />
-    [Authorize(UnitySelector.Applicant.Contact.Update)]
+    [Authorize(UnitySelector.ApplicantManagement.Contacts.Update)]
     public virtual async Task<ContactDto> UpdateAsync(Guid applicantId, Guid contactId, UpdateApplicantContactDto input)
     {
         ArgumentNullException.ThrowIfNull(input);
@@ -64,7 +64,7 @@ public virtual async Task<ContactDto> UpdateAsync(Guid applicantId, Guid contact
     }
 
     /// <inheritdoc />
-    [Authorize(UnitySelector.Applicant.Contact.Update)]
+    [Authorize(UnitySelector.ApplicantManagement.Contacts.Update)]
     public virtual async Task<bool> SetPrimaryAsync(Guid applicantId, Guid contactId)
     {
         await contactManager.SetPrimaryAsync(ApplicantEntityType, applicantId, contactId);