Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: commas on geo names and ids #3862

Merged
merged 2 commits into from
Feb 12, 2025
Merged

fix: commas on geo names and ids #3862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c680f2
fix: commas on geo names and ids
rafasdc Feb 11, 2025
9ea087c
chore: release v1.243.3
ccbc-service-account Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
9 changes: 5 additions & 4 deletions app/backend/lib/dashboard/dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || '' },
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/tests/backend/lib/dashboard/dashboard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand Down
Loading