From 7c680f23d910a838d637d60a1316099c9f0ca21e Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:26:33 -0800 Subject: [PATCH 1/2] fix: commas on geo names and ids --- app/backend/lib/dashboard/dashboard.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/backend/lib/dashboard/dashboard.ts b/app/backend/lib/dashboard/dashboard.ts index ee7c150b97..1154c2964e 100644 --- a/app/backend/lib/dashboard/dashboard.ts +++ b/app/backend/lib/dashboard/dashboard.ts @@ -342,10 +342,11 @@ export const generateDashboardExport = async (applicationData, cbcData) => { { value: `${summaryData?.formData?.locations?.regionalDistricts || ''}` }, // geographic names { - value: `${benefitingCommunitiesNames.join(',')} ${benefitingIndigenousCommunitiesNames.join(',')}`, + value: `${benefitingCommunitiesNames.length > 0 ? benefitingCommunitiesNames.join(',') : ''}${benefitingIndigenousCommunitiesNames.length > 0 ? (benefitingCommunitiesNames.length > 0 ? ',' : '') + benefitingIndigenousCommunitiesNames.join(',') : ''}`, }, + // geo ids { - value: `${benefitingCommunitiesIds.join(',')} ${benefitingIndigenousCommunitiesIds.join(',')}`, + value: `${benefitingCommunitiesIds.length > 0 ? benefitingCommunitiesIds.join(',') : ''}${benefitingIndigenousCommunitiesIds.length > 0 ? (benefitingCommunitiesIds.length > 0 ? ',' : '') + benefitingIndigenousCommunitiesIds.join(',') : ''}`, }, // total communities and locales { value: summaryData?.formData?.counts?.communities || '' }, @@ -533,9 +534,9 @@ export const generateDashboardExport = async (applicationData, cbcData) => { // regional district { value: communities.regionalDistricts }, // geographic names - { value: communities.bcGeographicNames }, + { value: communities.bcGeographicNames.join(',') }, // geo ids - { value: communities.bcGeographicIds }, + { value: communities.bcGeographicIds.join(',') }, // total communities and locales { value: communities.totalCount }, // indigenous communities From 9ea087cdc3dc5e28f6d1abf22f85e4bebaa6e150 Mon Sep 17 00:00:00 2001 From: CCBC Service Account <116113628+ccbc-service-account@users.noreply.github.com> Date: Wed, 12 Feb 2025 18:48:28 +0000 Subject: [PATCH 2/2] chore: release v1.243.3 test: update tests --- CHANGELOG.md | 6 ++++++ app/tests/backend/lib/dashboard/dashboard.test.ts | 4 ++-- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac5cfed2c3..ab5a724a94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [1.243.3](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.243.2...v1.243.3) (2025-02-12) + +### Bug Fixes + +- commas on geo names and ids ([7c680f2](https://github.com/bcgov/CONN-CCBC-portal/commit/7c680f23d910a838d637d60a1316099c9f0ca21e)) + ## [1.243.2](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.243.1...v1.243.2) (2025-02-12) ## [1.243.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.243.0...v1.243.1) (2025-02-12) diff --git a/app/tests/backend/lib/dashboard/dashboard.test.ts b/app/tests/backend/lib/dashboard/dashboard.test.ts index 7fddad0061..b83b1eef8a 100644 --- a/app/tests/backend/lib/dashboard/dashboard.test.ts +++ b/app/tests/backend/lib/dashboard/dashboard.test.ts @@ -72,8 +72,8 @@ describe('Dashboard export functions', () => { null, 'Vancouver Island and Coast', 'Regional District of Mount Waddington', - 'Echo Bay Gwayasdums 1', - '26059 65365', + 'Echo Bay,Gwayasdums 1', + '26059,65365', 2, 1, 635, diff --git a/package.json b/package.json index d769ad3fbc..4c654e2658 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CONN-CCBC-portal", - "version": "1.243.2", + "version": "1.243.3", "main": "index.js", "repository": "https://github.com/bcgov/CONN-CCBC-portal.git", "author": "Romer, Meherzad CITZ:EX ",