Dev

.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/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.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Handlers/UpsertSupplierHandler.cs

@@ -26,7 +26,10 @@ public async Task HandleEventAsync(UpsertSupplierEto eventData)
         {
             SupplierDto supplierDto = await GetSupplierFromEvent(eventData);
             var existingSites = await siteAppService.GetSitesBySupplierIdAsync(supplierDto.Id);
-            var existingSitesDictionary = existingSites?.ToDictionary(s => s.Number) ?? new Dictionary<string, Site>();
+            var existingSitesDictionary = existingSites?
+                .GroupBy(s => s.Number)
+                .ToDictionary(g => g.Key, g => g.First())
+                ?? new Dictionary<string, Site>();
 
             var defaultPaymentGroup = await ResolveDefaultPaymentGroupAsync(eventData);
             await UpsertSitesFromEventDtoAsync(existingSitesDictionary, supplierDto.Id, eventData, defaultPaymentGroup);

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/CreatePaymentRequests.cshtml.cs

@@ -319,7 +319,7 @@ private async Task<decimal> GetRemainingAmountAllowedByApplicationAsync(GrantApp
 
             // Get parent links for this application
             var allLinks = await applicationLinksService.GetListByApplicationAsync(application.Id);
-            var parentLink = allLinks.Find(link => link.LinkType == ApplicationLinkType.Parent);
+            var parentLink = allLinks.Find(link => link.LinkType == ApplicationLinkType.Parent && link.ApplicationId != application.Id);
 
             // Rule 2: No parent link exists
             if (parentLink == null)
@@ -485,7 +485,7 @@ private async Task PopulateParentChildValidationData()
                     // Parent not in submission, get from first child's link
                     var firstChild = await applicationService.GetAsync(children[0].CorrelationId);
                     var allLinks = await applicationLinksService.GetListByApplicationAsync(firstChild.Id);
-                    var parentLink = allLinks.Find(link => link.LinkType == ApplicationLinkType.Parent);
+                    var parentLink = allLinks.Find(link => link.LinkType == ApplicationLinkType.Parent && link.ApplicationId != firstChild.Id);
 
                     if (parentLink == null)
                     {
@@ -569,7 +569,7 @@ private async Task<List<string>> ValidateParentChildPaymentAmounts()
                     // Parent not in submission, get from first child's link
                     var firstChild = await applicationService.GetAsync(children[0].CorrelationId);
                     var allLinks = await applicationLinksService.GetListByApplicationAsync(firstChild.Id);
-                    var parentLink = allLinks.Find(link => link.LinkType == ApplicationLinkType.Parent);
+                    var parentLink = allLinks.Find(link => link.LinkType == ApplicationLinkType.Parent && link.ApplicationId != firstChild.Id);
 
                     if (parentLink == null)
                     {

applications/Unity.GrantManager/sonar-project.properties

@@ -0,0 +1,34 @@
+# SonarCloud configuration for Unity Grant Manager
+sonar.projectKey=bcgov_Unity
+sonar.organization=bcgov-sonarcloud
+sonar.host.url=https://sonarcloud.io
+
+# Project metadata
+sonar.projectName=Unity
+sonar.projectDescription=Grant management application for the Province of British Columbia
+
+# Source code settings
+sonar.sources=src,modules
+sonar.tests=test
+
+# Quality gate settings (from Azure SonarQube)
+sonar.qualitygate.wait=true
+
+# SonarQube Exclusions (from existing Azure configuration)
+sonar.exclusions=src/Unity.GrantManager.EntityFrameworkCore/Migrations/**,modules/Unity.Payments/src/Unity.Payments.Web/Pages/BatchPayments/Index.js,**/bin/**,**/obj/**,**/wwwroot/lib/**,**/*.Designer.cs,**/node_modules/**
+
+# Test exclusions
+sonar.test.exclusions=**/bin/**,**/obj/**
+
+# Code coverage exclusions (from existing Azure configuration)
+sonar.coverage.exclusions=modules/Volo.BasicTheme/**,**/Migrations/**,**/*DbContext.cs,**/*EntityTypeConfiguration.cs,**/Program.cs,**/Startup.cs,**/*.Designer.cs,**/DbMigrator/**
+
+# Code duplication exclusions (from existing Azure configuration)
+sonar.cpd.exclusions=**/*.aspx,**/*.aspx.designer.cs,**/*.cshtml,**/*.html,**/*.js
+
+# Coverage report paths (adapted for GitHub Actions)
+sonar.cs.vscoveragexml.reportsPaths=**/TestResults/**/*.coveragexml,**/coverage.coveragexml
+sonar.cs.vstest.reportsPaths=**/TestResults/**/*.trx
+
+# SCM settings
+sonar.scm.provider=git

applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs

@@ -135,6 +135,7 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     .. Dashboard_CommonPermissions,
                     .. Tags_CommonPermissions,
                     AIPermissions.Configuration.ConfigureAI,
+                    FlexPermissions.Worksheets.Default,
                     FlexPermissions.Worksheets.Delete
             ], context.TenantId);
 

applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Applicants/Details.js

@@ -86,7 +86,7 @@ const debouncedResizeAwareDataTables = debounce(() => {
     $('table[data-resize-aware="true"]:visible').each(function () {
         try {
             const table = $(this).DataTable();
-            table.columns.adjust().draw(false);
+            table.columns.adjust();
         }
         catch (error) {
             console.error('Failed to adjust DataTable columns:', error);
@@ -104,7 +104,7 @@ function adjustVisibleTablesInContainer(containerId) {
     tables.each(function () {
         try {
             const table = $(this).DataTable();
-            table.columns.adjust().draw(false);
+            table.columns.adjust();
         }
         catch (error) {
             console.error('Failed to adjust DataTable in tab:', error);

applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentResultAttachments/Default.cshtml

@@ -1,4 +1,4 @@
-<div class="px-3 d-flex flex-row justify-content-end align-items-end mb-3">
+<div class="px-3 d-flex flex-row justify-content-end align-items-end mb-3" style="margin-top: -50px">
     <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" id="btn-toggle-filter-assessment-attachments" title="Filter">
         <span>Filter</span>
     </button>

applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.json

@@ -74,6 +74,7 @@
     "Bucket": "",
     "Endpoint": "",
     "SecretAccessKey": "",
+    "ApplicantS3Folder": "Unity/Applicant",
     "ApplicationS3Folder": "Unity/Application",
     "AssessmentS3Folder": "Unity/Adjudication",
     "DisallowedFileTypes": "[ \"exe\",\"sh\",\"ksh\",\"bat\",\"cmd\" ]",