Dev

.github/workflows/docker-build-dev.yml

@@ -1,4 +1,6 @@
 name: Dev - Build & Push docker images
+permissions:
+  contents: read
 
 on:
   push:
@@ -87,6 +89,8 @@ jobs:
     needs: [Setup,Branch]
     runs-on: ubuntu-latest
     environment: dev
+    permissions:
+      actions: write
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

.github/workflows/docker-build-main.yml

@@ -1,4 +1,6 @@
 name: Main - Build & Push docker images
+permissions:
+  contents: read
 
 on:
   push:
@@ -36,7 +38,7 @@ env:
   UGM_RELEASE_PREFIX: Unity_Grant_Manager_v
   UGM_RELEASE_MESSAGE: "Production deployment"
 
-jobs:
+jobs:  
   Setup:
     runs-on: ubuntu-latest
     environment: main
@@ -87,6 +89,8 @@ jobs:
     needs: [Setup,Branch]
     runs-on: ubuntu-latest
     environment: main
+    permissions:
+      contents: write
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -138,6 +142,8 @@ jobs:
     needs: [Setup,Branch,GenerateTag]
     runs-on: ubuntu-latest
     environment: main
+    permissions:
+      actions: write
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

.github/workflows/docker-build-test.yml

@@ -1,4 +1,6 @@
 name: Test - Build & Push docker images
+permissions:
+  contents: read
 
 on:
   push:
@@ -110,6 +112,8 @@ jobs:
       TAGVERSION: ${{steps.tag_selector.outputs.TAGVERSION}}
   PushVariables:
     needs: [Setup,Branch,GenerateTag]
+    permissions:
+      actions: write
     runs-on: ubuntu-latest
     environment: test
     steps:

.github/workflows/manual-trigger.yml

@@ -1,6 +1,8 @@
 # This is a basic workflow that is manually triggered
 
 name: Workflow - Run manual trigger
+permissions:
+  contents: read
 
 # Controls when the action will run. Workflow runs when manually triggered
 on:
@@ -82,6 +84,8 @@ jobs:
     needs: [Setup,Branch]
     runs-on: ubuntu-latest
     environment: ${{ inputs.name }}
+    permissions:
+      actions: write
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

.github/workflows/pr-check-dev-branch.yml

@@ -1,4 +1,6 @@
 name: Dev - Branch Protection
+permissions:
+  contents: read
 
 on:
   pull_request:

.github/workflows/pr-check-main-branch.yml

@@ -1,4 +1,6 @@
 name: Main - Branch Protection
+permissions:
+  contents: read
 
 on:
   pull_request:

.github/workflows/pr-check-test-branch.yml

@@ -1,4 +1,6 @@
 name: Test - Branch Protection
+permissions:
+  contents: read
 
 on:
   pull_request:

README.md

@@ -1,23 +1,26 @@
 # Unity Portal
+
 [![Lifecycle:Stable](https://img.shields.io/badge/Lifecycle-Stable-97ca00)](https://github.com/bcgov/repomountie/blob/master/doc/lifecycle-badges.m)
 The project is in a reliable state and major changes are unlikely to happen.
 
 ## Directory Structure
 
-    .github                    - GitHub Actions
-    applications/              - Application Root
-    ├── Unity.ApplicantPortal/ - Applicant Information solution
-    ├── Unity.AutoUI/          - Automated User Interface testing
-    ├── Unity.GrantManager/    - Grant manager and adjudication solution
-    ├── Unity.RabbitMQ/        - Messaging and streaming broker configuration
-    ├── Unity.Tools/           - DevOps tools
-    database/                  - Database configuration files
-    documentation/             - Solution documentation and assets
-    openshift/                 - OpenShift deployment files
-    COMPLIANCE.yaml            - BCGov PIA/STRA compliance status
-    CONTRIBUTING.md            - How to contribute
-    LICENSE                    - License
-    SECURITY.md                - Security Policy and Reporting
+    .github/                    - GitHub Actions and workflows
+    applications/               - Application root containing all major components
+    ├── Unity.AutoUI/           - Automated end-to-end UI testing (Cypress)
+    ├── Unity.GrantManager/     - Grant management and adjudication solution
+    └── Unity.Tools/            - Supporting tools and services
+        ├── Unity.Metabase/     - Reserved for Metabase integration
+        ├── Unity.NginxData/    - Nginx HTTP server and reference files
+        ├── Unity.RabbitMQ/     - RabbitMQ message broker configuration
+        └── Unity.RedisSentinel/- Redis Sentinel high-availability setup
+    database/                   - Database configuration and scripts
+    documentation/              - Solution documentation and assets
+    openshift/                  - OpenShift deployment files and configs
+    COMPLIANCE.yaml             - BCGov PIA/STRA compliance status
+    CONTRIBUTING.md             - How to contribute
+    LICENSE                     - License
+    SECURITY.md                 - Security Policy and Reporting
 
 ## Documentation
 

SECURITY.md

@@ -3,7 +3,7 @@
 This document outlines security procedures for the Economy Sector Grant Management Solution application project.
 
 - [Supported Versions](#supported-versions)
-- [Reporting a Security Bug](#reporting-a-bug)
+- [Reporting a Security Bug](#reporting-a-security-bug)
 - [Disclosure Policy](#disclosure-policy)
 - [Comments on this Policy](#comments-on-this-policy)
 
@@ -17,7 +17,7 @@ This document outlines security procedures for the Economy Sector Grant Manageme
 
 ## Reporting a Security Bug
 
-The `Unity` team and community take all security bugs seriously. Reporting security issues can be helpful to the team this can be done by sending an email to <[email protected]>
+The `Unity` team and community take all security bugs seriously. Reporting security issues can be helpful to the team. This can be done by sending an email to <[email protected]>
 
 ## Disclosure Policy
 
@@ -29,4 +29,4 @@ When the `Unity` team receives a bug report, they will assign it to a primary ha
 
 ## Comments on this Policy
 
-If you have suggestions on how this process could be improved please send an email to <[email protected]>
+If you have suggestions on how this process could be improved please send an email to <[email protected]>

applications/README.md

@@ -1,7 +1,7 @@
-# Unity Solution
+# Unity Application Solution
 
-- [Unity.ApplicantPortal](Unity.ApplicantPortal/README.md)
-- [Unity.AutoUI](Unity.AutoUI/README.md)
-- [Unity.GrantManager](Unity.GrantManager/README.md)
-- [Unity.RabbitMQ](Unity.RabbitMQ/README.md)
-- [Unity.Tools](Unity.Tools/README.md)
+This directory contains all major application components for the Unity platform:
+
+- [Unity.AutoUI](Unity.AutoUI/README.md): Cypress-based end-to-end testing project for the Unity Grant Manager application.
+- [Unity.GrantManager](Unity.GrantManager/README.md): Main grant management application, including backend and web components.
+- [Unity.Tools](Unity.Tools/README.md): Collection of supporting tools and services for the Unity platform.

applications/Unity.AutoUI/README.md

@@ -2,6 +2,16 @@
 
 This project uses a Cypress folder structure to automate end-to-end testing for the Unity Grant Manager application. The Cypress testing framework executes automated tests to ensure the quality and reliability of the web application using continuous integration.
 
+## Subfolders and Files
+
+- `cypress/`: Cypress configuration and test files.
+- `cypress.config.ts`: Cypress configuration in TypeScript.
+- `cypress.pipeline.env.json`: CI/CD environment overrides.
+- `package.json`, `package-lock.json`: Project dependencies and metadata.
+- `tsconfig.json`: TypeScript configuration.
+
+See the README for setup and usage instructions.
+
 ## Getting Started
 
 To get started with this Cypress project, follow these steps:

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('[email protected]'); // 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('[email protected]'); // 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/README.md

@@ -1,5 +1,13 @@
 # Unity Grant Manager Application
 
+This is the main grant management application for the Unity platform. It includes backend services, web components, and database management.
+
+## Subfolders
+
+- `modules/`: Application modules.
+- `src/`: Source code for the application.
+- `test/`: Test projects and files.
+
 ## Getting Started
 
 1. With .NET Core installed, run `dotnet tool install -g Volo.Abp.Cli`
@@ -26,4 +34,4 @@
 - [ABP Platform Roadmap](https://docs.abp.io/en/abp/latest/Road-Map)
 - [ABP Platform Module Packages](https://abp.io/packages)
 
-- [EF Core Database Migrations](https://docs.abp.io/en/abp/latest/Entity-Framework-Core-Migrations) 
+- [EF Core Database Migrations](https://docs.abp.io/en/abp/latest/Entity-Framework-Core-Migrations)

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; }