Merge pull request #1972 from bcgov/dev

Dev

Author: JamesPasta

applications/Unity.AutoUI/cypress.pipeline.env.json

@@ -4,5 +4,8 @@
   "test1username": "{{test1username}}",
   "test1password": "{{test1password}}",
   "test2username": "{{test2username}}",
-  "test2password": "{{test2password}}"
+  "test2password": "{{test2password}}",
+  "TEST_EMAIL_TO": "{{test_email_to}}",
+  "TEST_EMAIL_CC": "{{test_email_CC}}",
+  "TEST_EMAIL_BCC": "{{test_email_BCC}}"
 }

applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts

@@ -1,9 +1,9 @@
 // cypress/e2e/basicEmail.cy.ts
 
 describe('Send an email', () => {
-    const TEST_EMAIL_TO = 'grantmanagementsupport@gov.bc.ca'
-    const TEST_EMAIL_CC = 'UnitySupport@gov.bc.ca'
-    const TEST_EMAIL_BCC = 'UNITYSUP@Victoria1.gov.bc.ca'
+    const TEST_EMAIL_TO = Cypress.env('TEST_EMAIL_TO') as string
+    const TEST_EMAIL_CC = Cypress.env('TEST_EMAIL_CC') as string
+    const TEST_EMAIL_BCC = Cypress.env('TEST_EMAIL_BCC') as string
     const TEMPLATE_NAME = 'Test Case 1'
     const STANDARD_TIMEOUT = 20000
 

applications/Unity.AutoUI/cypress/e2e/chefsdata.cy.ts

@@ -43,7 +43,8 @@ public async Task SeedAsync(DataSeedContext context)
             new EmailTempateVariableDto { Name = "Signing Authority Title", Token = "signing_authority_title", MapTo = "signingAuthorityTitle" },
             new EmailTempateVariableDto { Name = "Applicant ID", Token = "applicant_id", MapTo = "applicant.unityApplicantId" },
             new EmailTempateVariableDto { Name = "Requested Amount", Token = "requested_amount", MapTo = "requestedAmount" },
-            new EmailTempateVariableDto { Name = "Recommended Amount", Token = "recommended_amount", MapTo = "recommendedAmount" }
+            new EmailTempateVariableDto { Name = "Recommended Amount", Token = "recommended_amount", MapTo = "recommendedAmount" },
+            new EmailTempateVariableDto { Name = "Unity Application ID", Token = "unity_application_id", MapTo = "unityApplicationId" }
         };
 
         try

applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Domain/NotificationsDataSeedContributor.cs

@@ -380,7 +380,9 @@
          */
         clearFilters: function () {
             let dt = this.s.dt;
-            let externalSearchId = dt.init().externalSearchInputId;
+            let dtInit = dt.init();
+            let externalSearchId = dtInit.externalSearchInputId;
+            let initialSortOrder = (dtInit && dtInit.order) ? dtInit.order : [];
 
             // Clear external search
             if (externalSearchId) {
@@ -391,10 +393,10 @@
             $('.custom-filter-input').val('');
 
             // Clear DataTable searches
-            dt.search('').columns().search('').draw();
+            dt.search('').columns().search('');
 
             // Clear order
-            dt.order([]).draw();
+            dt.order(initialSortOrder);
 
             // Reload data
             dt.ajax.reload();

applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/plugins/filterRow.js

@@ -348,7 +348,7 @@
     "Summary:Application.ProjectBudget": "Total Project Budget",
     "Summary:Application.Sector": "Sector",
     "Summary:Application.Owner": "Owner",
-    "Summary:Application.UnityApplicationId": "Unity Application Id",
+    "Summary:Application.UnityApplicationId": "Unity Application ID",
     "Summary:Application.Assignees": "Assignees",
     "Summary:Assessment.Status": "Status",
     "Summary:Assessment.LikelihoodOfFunding": "Likelihood Of Funding",

applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json

@@ -26,5 +26,8 @@ Task<List<Application>> WithFullDetailsAsync(
             DateTime? submittedToDate = null,
             string? searchTerm = null // optional search filter
         );
+
+        // Get applications by applicant ID
+        Task<List<Application>> GetByApplicantIdAsync(Guid applicantId);
     }
 }

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/IApplicationRepository.cs

@@ -6,9 +6,6 @@ namespace Unity.GrantManager.Contacts;
 
 public class Contact : AuditedAggregateRoot<Guid>, IMultiTenant
 {
-    public bool IsPrimary { get; set; } = false;
-    public string RelatedEntityType { get; set; } = string.Empty;
-    public Guid RelatedEntityId { get; set; }
     public string Name { get; set; } = string.Empty;
     public string? Title { get; set; }
     public string? Email { get; set; }

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Contacts/Contact.cs

@@ -0,0 +1,16 @@
+using System;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.Contacts;
+
+public class ContactLink : AuditedAggregateRoot<Guid>, IMultiTenant
+{
+    public Guid ContactId { get; set; }
+    public string RelatedEntityType { get; set; } = string.Empty;
+    public Guid RelatedEntityId { get; set; }    
+    public string? Role { get; set; }
+    public bool IsPrimary { get; set; } = false;
+    public bool IsActive { get; set; } = true;
+    public Guid? TenantId { get; set; }
+}

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Contacts/ContactLink.cs

@@ -0,0 +1,8 @@
+using System;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.GrantManager.Contacts;
+
+public interface IContactLinkRepository : IRepository<ContactLink, Guid>
+{
+}