Dev

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

@@ -125,10 +125,10 @@ jobs:
         echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
     - name: Push application images to Artifactory container registry
       run: |
-        docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator
-        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator
-        docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web
-        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web
+        docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
+        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
+        docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
+        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
     - name: Disconnect docker from JFrog Artifactory
       run: |
         docker logout

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

@@ -158,10 +158,10 @@ jobs:
         echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
     - name: Push application images to Artifactory container registry
       run: |
-        docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator
-        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator
-        docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web
-        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web
+        docker tag unity-grantmanager-dbmigrator $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
+        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-dbmigrator:latest
+        docker tag unity-grantmanager-web $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
+        docker push $JFROG_SERVICE/$JFROG_REPO_PATH/unity-grantmanager-web:latest
     - name: Disconnect docker from JFrog Artifactory
       run: |
         docker logout

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

@@ -69,7 +69,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v4
+      - uses: actions/setup-dotnet@v5
         with:
           dotnet-version: "9.0.x"
 
@@ -85,7 +85,7 @@ jobs:
             --logger "trx;LogFileName=${NAME}.trx" \
             --results-directory TestResults
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: test-output-${{ strategy.job-index }}
           path: TestResults/
@@ -133,7 +133,7 @@ jobs:
           echo "failed=$FAILED" >> $GITHUB_OUTPUT
           echo "skipped=$SKIPPED" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: merged-test-results
           path: merged/

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

@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v4
+      - uses: actions/setup-dotnet@v5
         with:
           dotnet-version: "9.0.x"
 
@@ -81,7 +81,7 @@ jobs:
             --logger "trx;LogFileName=${NAME}.trx" \
             --results-directory TestResults
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: test-output-${{ strategy.job-index }}
           path: TestResults/
@@ -129,7 +129,7 @@ jobs:
           echo "failed=$FAILED" >> $GITHUB_OUTPUT
           echo "skipped=$SKIPPED" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: merged-test-results
           path: merged/

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

@@ -67,7 +67,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/setup-dotnet@v4
+      - uses: actions/setup-dotnet@v5
         with:
           dotnet-version: "9.0.x"
 
@@ -83,7 +83,7 @@ jobs:
             --logger "trx;LogFileName=${NAME}.trx" \
             --results-directory TestResults
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: test-output-${{ strategy.job-index }}
           path: TestResults/
@@ -131,7 +131,7 @@ jobs:
           echo "failed=$FAILED" >> $GITHUB_OUTPUT
           echo "skipped=$SKIPPED" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: merged-test-results
           path: merged/

.github/workflows/sonarsource-scan.yml

@@ -0,0 +1,92 @@
+name: SonarCloud Analysis
+
+on:
+  push:
+    branches:
+      - dev2
+#      - dev
+#      - test
+#      - main
+#  pull_request:
+#    types: [opened, synchronize, reopened]
+#  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write
+  checks: write
+  security-events: write
+
+
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    environment: ${{ github.ref_name == 'main' && 'main' || github.ref_name == 'test' && 'test' || 'dev' }}
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: 'zulu'
+
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: '9.0.x'
+
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v5
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: Cache SonarCloud scanner
+        id: cache-sonar-scanner
+        uses: actions/cache@v5
+        with:
+          path: ./.sonar/scanner
+          key: ${{ runner.os }}-sonar-scanner
+          restore-keys: ${{ runner.os }}-sonar-scanner
+
+      - name: Install SonarCloud scanner
+        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+        run: |
+          dotnet tool install --global dotnet-sonarscanner
+
+      - name: Set version for SonarCloud
+        run: |
+          VERSION="${{ vars.UGM_BUILD_VERSION }}"
+          echo "Debug: UGM_BUILD_VERSION variable value: '$VERSION'"
+          if [ -z "$VERSION" ]; then
+            echo "BUILD_VERSION=1.0.0-dev" >> $GITHUB_ENV
+            echo "Using fallback version: 1.0.0-dev (UGM_BUILD_VERSION variable not set)"
+          else
+            echo "BUILD_VERSION=$VERSION" >> $GITHUB_ENV
+            echo "Using project version: $VERSION"
+          fi
+
+      - name: Restore dependencies
+        working-directory: ./applications/Unity.GrantManager
+        run: dotnet restore Unity.GrantManager.sln
+
+      - name: Build solution
+        working-directory: ./applications/Unity.GrantManager
+        run: dotnet build Unity.GrantManager.sln --no-restore
+
+      - name: Run tests with coverage
+        working-directory: ./applications/Unity.GrantManager
+        run: dotnet test Unity.GrantManager.sln --no-build --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./TestResults/
+
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarqube-scan-action@v7
+        with:
+          projectBaseDir: applications/Unity.GrantManager
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

applications/Unity.AutoUI/cypress.config.ts

@@ -8,6 +8,16 @@ export default defineConfig({
   e2e: {
     setupNodeEvents(on) {
       on("task", {
+        readJsonIfExists(filePath: string): Record<string, unknown> | null {
+          try {
+            // path.resolve handles both forward and back slashes on Windows
+            const content = fs.readFileSync(path.resolve(filePath), "utf-8");
+            return JSON.parse(content);
+          } catch {
+            return null;
+          }
+        },
+
         async uploadChefsFile({
           baseURL,
           authToken,

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

@@ -75,7 +75,8 @@ describe('Grant Manager Login and List Navigation', () => {
             cy.get(listboxSel).within(() => {
                 cy.get('a.dropdown-item[role="option"]').then(($opts) => {
                     const match = $opts.filter((_, el) => {
-                        const text = el.querySelector('span.text')?.textContent || ''
+                        const textNode = el.querySelector('span.text')
+                        const text = textNode ? textNode.textContent || '' : ''
                         return text.trim() === 'Test'
                     })
 
@@ -95,7 +96,8 @@ describe('Grant Manager Login and List Navigation', () => {
                 })
             })
 
-            cy.get('body').click(0, 0)
+            cy.get(btnSel).first().click({ force: true })
+            cy.get(btnSel).first().should('have.attr', 'aria-expanded', 'false')
         })
     }
 

applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts

@@ -182,7 +182,7 @@ export class ApplicationDetailsPage extends BasePage {
       | "projectInfo"
       | "applicantInfo"
       | "fundingAgreement"
-      | "paymentInfo"
+      | "paymentInfo",
   ): this {
     const tabSelectors: Record<string, string> = {
       submission: this.tabs.submission,
@@ -348,20 +348,24 @@ export class ApplicationDetailsPage extends BasePage {
    * Verify Site Info table is populated
    */
   verifySiteInfoTablePopulated(): this {
-    cy.get("#SiteInfoTable tbody tr", { timeout: 20000 })
-      .should("have.length.at.least", 1);
+    cy.get("#SiteInfoTable tbody tr", { timeout: 20000 }).should(
+      "have.length.at.least",
+      1,
+    );
     return this;
   }
 
   /**
    * Verify Site Info table has data in specific columns
    */
   verifySiteInfoTableHasData(): this {
-    cy.get("#SiteInfoTable tbody tr", { timeout: 20000 }).first().within(() => {
-      cy.get("td").eq(0).should("not.be.empty"); // Site #
-      cy.get("td").eq(1).should("not.be.empty"); // Pay Group
-      cy.get("td").eq(2).should("not.be.empty"); // Mailing Address
-    });
+    cy.get("#SiteInfoTable tbody tr", { timeout: 20000 })
+      .first()
+      .within(() => {
+        cy.get("td").eq(0).should("not.be.empty"); // Site #
+        cy.get("td").eq(1).should("not.be.empty"); // Pay Group
+        cy.get("td").eq(2).should("not.be.empty"); // Mailing Address
+      });
     return this;
   }
 
@@ -392,8 +396,9 @@ export class ApplicationDetailsPage extends BasePage {
    * Select Payment Group in Edit Site modal
    */
   selectPaymentGroup(paymentGroup: "EFT" | "Cheque"): this {
-    cy.get("#Site_PaymentGroup", { timeout: 20000 })
-      .select(paymentGroup, { force: true });
+    cy.get("#Site_PaymentGroup", { timeout: 20000 }).select(paymentGroup, {
+      force: true,
+    });
     return this;
   }
 
@@ -406,7 +411,9 @@ export class ApplicationDetailsPage extends BasePage {
       .click({ force: true });
     cy.wait(2000); // Wait for save to process
     cy.get("body").type("{esc}");
-    cy.get(".modal.show, .modal.fade.show", { timeout: 20000 }).should("not.exist");
+    cy.get(".modal.show, .modal.fade.show", { timeout: 20000 }).should(
+      "not.exist",
+    );
     cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
     return this;
   }
@@ -435,7 +442,9 @@ export class ApplicationDetailsPage extends BasePage {
           .click({ force: true });
       }
     });
-    cy.get(this.statusActions.dropdownMenu, { timeout: 10000 }).should("be.visible");
+    cy.get(this.statusActions.dropdownMenu, { timeout: 10000 }).should(
+      "be.visible",
+    );
   }
 
   /**
@@ -472,26 +481,36 @@ export class ApplicationDetailsPage extends BasePage {
 
   /**
    * Click Approve action.
-   * If "Complete Assessment" is enabled in the dropdown, click it first,
-   * then reopen the dropdown before clicking Approve.
+   * If "Complete Assessment" is present and enabled in the dropdown, click it first
+   * (and confirm any resulting dialog), then reopen the dropdown before clicking Approve.
    */
   clickApprove(): this {
     this.openStatusActionsDropdown();
-    cy.get(this.statusActions.completeAssessment).then(($btn) => {
-      if (!$btn.is(":disabled")) {
-        cy.wrap($btn).click({ force: true });
-        cy.get("body").then(($body) => {
-          if ($body.find(this.confirmModal.modal).filter(":visible").length > 0) {
+
+    // Use body-check so we never timeout when the button is absent from the DOM
+    cy.get("body").then(($body) => {
+      const $completeBtn = $body.find(this.statusActions.completeAssessment);
+      if ($completeBtn.length > 0 && !$completeBtn.is(":disabled")) {
+        cy.wait(10000); // Wait for any potential UI updates before clicking
+        cy.wrap($completeBtn).click();
+        cy.wait(2000); // Wait for any potential UI updates after clicking
+        cy.get("body").then(($b) => {
+          if ($b.find(this.confirmModal.modal).filter(":visible").length > 0) {
             cy.get(this.confirmModal.modal)
               .find(this.confirmModal.confirmButton)
               .click({ force: true });
           }
         });
-        // Wait for page to stabilize after status transition
-        cy.get(this.statusActions.dropdownToggle, { timeout: 20000 }).should("be.visible");
+        this.dismissErrorModalIfPresent();
+
+        // Wait for the page to stabilize before reopening the dropdown
+        cy.get(this.statusActions.dropdownToggle, { timeout: 20000 }).should(
+          "be.visible",
+        );
         cy.wait(2000);
       }
     });
+
     // Always reopen dropdown fresh before clicking Approve (dropdown may have closed)
     this.openStatusActionsDropdown();
     cy.get(this.statusActions.approve, { timeout: 10000 })
@@ -604,7 +623,7 @@ export class ApplicationDetailsPage extends BasePage {
       | "close"
       | "withdraw"
       | "defer"
-      | "onHold"
+      | "onHold",
   ): void {
     const actionSelectors: Record<string, string> = {
       startReview: this.statusActions.startReview,
@@ -636,7 +655,7 @@ export class ApplicationDetailsPage extends BasePage {
       | "close"
       | "withdraw"
       | "defer"
-      | "onHold"
+      | "onHold",
   ): void {
     const actionSelectors: Record<string, string> = {
       startReview: this.statusActions.startReview,

applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts

@@ -387,7 +387,11 @@ export class ReviewAssessmentPage extends BasePage {
    * Set decision date to today (format: YYYY-MM-DD)
    */
   setDecisionDateToToday(): this {
-    const today = new Date().toISOString().split("T")[0];
+    const now = new Date();
+    const yyyy = now.getFullYear();
+    const mm = String(now.getMonth() + 1).padStart(2, "0");
+    const dd = String(now.getDate()).padStart(2, "0");
+    const today = `${yyyy}-${mm}-${dd}`;
     cy.get(this.assessment.decisionDate, { timeout: this.STANDARD_TIMEOUT })
       .clear()
       .type(today);