Merge pull request #1348 from bcgov/test

Test

Author: jimmyPasta

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

@@ -1,14 +1,19 @@
+/// <reference types="cypress" />
 describe('Unity Login and check data from CHEFS', () => {
+	
   it('Verify Login', () => {
     cy.login()
   })
   // 19.) Verify that the info panel populates with mapped data
   it('Verify the UI is populated with valid data from CHEFS', () => {
+    
     cy.getSubmissionDetail('confirmationID').then(id => {cy.log(`Confirmation ID: ${id}`);});
+
 	cy.get('#search').should('exist').clear(); // Ensure the field exists and clear its contents
 	cy.get('#search').click() // click the search field
 	cy.getSubmissionDetail('confirmationID').then(id => cy.get('#search').type(id)); // Fetch the confirmation ID and type it into the search field
     cy.getSubmissionDetail('confirmationID').then(id => cy.contains('tr', id).find('.checkbox-select').click()); // Fetch the confirmation ID, find its row, and click the checkbox
+
 	cy.get('#applicationLink').should('exist').click() // open the info panel
     // 19.) Verify that the info panel populates with mapped data
     // Category: AutoUI
@@ -153,17 +158,15 @@ describe('Unity Login and check data from CHEFS', () => {
       })
     // 25	Verify that the Payment Info tab populates with mapped data
     cy.get('#nav-payment-info-tab').should('exist').click() // open the Payment Info tab
-    // Requested Amount: 89000.00
-    cy.get('#RequestedAmount').should('have.value', '89000.00')
+    // Requested Amount: 89,000.00
+    cy.get('#RequestedAmount').should('have.value', '89,000.00')
     // 26.) Verify that the Submission tab populates with all form data
     cy.get('#nav-summery-tab').should('exist').click() // open the Submission tab 
-    cy.getSubmissionDetail('formObjectID').then(formId => { // Fetch formObjectID
-      let headers = ['1. INTRODUCTION','2. ELIGIBILITY','3. APPLICANT INFORMATION','4. PROJECT INFORMATION','5. PROJECT TIMELINES','6. PROJECT BUDGET','7. ATTESTATION']; // Define headers
-      headers.forEach((header, index) => { // Iterate over headers
-        cy.get(`#${formId} > div:nth-child(${index + 1}) > div.card-header.bg-default > h4`) // Select header element
-        .should('contain', header) // Assert header text
-        .click(); // Click header to expand/collapse
-      });
+    const headers = ['1. INTRODUCTION', '2. ELIGIBILITY', '3. APPLICANT INFORMATION','4. PROJECT INFORMATION', '5. PROJECT TIMELINES', '6. PROJECT BUDGET', '7. ATTESTATION'];
+    headers.forEach(header => {
+      cy.contains('h4', header)
+        .should('exist')
+        .click();
     });
   })
   it('Verify Logout', () => {

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

@@ -1,10 +1,11 @@
 describe('Grant Manager Login and List Navigation', () => {
+
   it('Verify Login', () => {
     cy.login()
   })
   // 12.) Ensure all of the lists are populated.
   it('Verify Applications, Roles, Users, Intakes, Forms, Dashboard lists are populated', () => {
-    // 12.) Verify Default Grant Program tenant is selected.
+    // Verify Default Grant Program tenant is selected.
     cy.get('.unity-user-initials').should('exist').click()
     cy.get('#user-dropdown .btn-dropdown span').should('contain', 'Default Grants Program')
     // 13.) Applications

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

@@ -1,4 +1,5 @@
 describe('Grant Manager Login and Logout', () => {
+
   it('Verify Default Grant Program tenant is selected.', () => {
     cy.login()
     cy.get('.unity-user-initials').should('exist').click()

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

@@ -1,4 +1,5 @@
 describe('Grant Manager Login and Top Navigation', () => {
+
   it('Verify Login', () => {
     cy.login()
   })

applications/Unity.AutoUI/cypress/fixtures/submissions.json

@@ -13,7 +13,7 @@
     {
       "unityEnv": "TEST",
       "confirmationID": "68090C5E",
-      "formObjectID": "efkdeiq"
+      "formObjectID": "evigmss"
     },
     {
       "unityEnv": "UAT",

applications/Unity.AutoUI/cypress/support/commands.ts

@@ -75,21 +75,22 @@ Cypress.Commands.add('getMetabaseDetail', (key: string) => {
 });
 
 Cypress.Commands.add('metabaseLogin', () => {
-  cy.getMetabaseDetail('baseURL').then(baseURL => {cy.visit(baseURL); // Visit the URL fetched from metabase.json
-    cy.get('#root > div > div > main > div > div.emotion-iq817s.euvero02 > div > div.emotion-1spv9yy > div > form > div:nth-child(1) > div.emotion-17sifsc.edcfyzd6 > input[name="username"]')
-    .should('exist')
-    .click();
-	cy.get('#root > div > div > main > div > div.emotion-iq817s.euvero02 > div > div.emotion-1spv9yy > div > form > div:nth-child(1) > div.emotion-17sifsc.edcfyzd6 > input[name="username"]')
-    .type('iDontHave@ValidEmail.com'); // the test account doesn't have an email address
-	cy.get('#root > div > div > main > div > div.emotion-iq817s.euvero02 > div > div.emotion-1spv9yy > div > form > div:nth-child(2) > div.emotion-17sifsc.edcfyzd6 > input[name="password"]')
+  cy.getMetabaseDetail('baseURL').then((baseURL) => {
+    cy.visit(baseURL);
+
+    // Target the username field using its `name` attribute
+    cy.get('input[name="username"]')
       .should('exist')
-      .click();
-	cy.get('#root > div > div > main > div > div.emotion-iq817s.euvero02 > div > div.emotion-1spv9yy > div > form > div:nth-child(2) > div.emotion-17sifsc.edcfyzd6 > input[name="password"]')
+      .click()
+      .type('iDontHave@ValidEmail.com'); // Placeholder email address
+
+    // Target the password field using its `name` attribute
+    cy.get('input[name="password"]')
       .should('exist')
-      .type('pointless'); // there's no point adding a valid password yet because the test account doesn't have an email address
-	  //.type(Cypress.env('test1password'))
+      .click()
+      .type('pointless'); // Placeholder password
   });
- });
+});
 
 interface chefsDetail {
   unityEnv: string;

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Scoresheets/QuestionDto.cs

@@ -12,7 +12,6 @@ public class QuestionDto : ExtensibleEntityDto<Guid>
         public virtual string Name { get; set; } = string.Empty;
         public virtual string Label { get; set; } = string.Empty;
         public virtual string? Description { get; set; }
-        public virtual bool Enabled { get; private set; }
         public virtual QuestionType Type { get; set; }
         public virtual uint Order { get; set; }
 

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/CustomFieldValue.cs

@@ -5,7 +5,7 @@
 
 namespace Unity.Flex.Domain.WorksheetInstances
 {
-    public class CustomFieldValue : FullAuditedEntity<Guid>, IMultiTenant
+    public class CustomFieldValue : AuditedEntity<Guid>, IMultiTenant
     {
         [Column(TypeName = "jsonb")]
         public virtual string CurrentValue { get; private set; } = "{}";

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/FlexWebModule.cs

@@ -1,12 +1,10 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using Unity.Flex.Localization;
-using Unity.Flex.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 
 namespace Unity.Flex.Web;
@@ -33,7 +31,7 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
 
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        
+
 
         Configure<AbpVirtualFileSystemOptions>(options =>
         {

applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Pages/Components/DataGrid/DataGridReadService.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Unity.Flex.Web.Views.Shared.Components.DataGridWidget;
 using Unity.Flex.Web.Views.Shared.Components.WorksheetInstanceWidget.ViewModels;
 using Unity.Flex.WorksheetInstances;
 using Unity.Flex.Worksheets;