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

Jump to bottom

Patch 3 #740

Merged
merged 14 commits into from
May 29, 2024
Merged

Patch 3 #740

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ea9731f
change in filter recursive
nitish-egov May 21, 2024
f761d21
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 21, 2024
cefa966
lowest level
nitish-egov May 21, 2024
577a6a0
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 21, 2024
99e8460
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 22, 2024
40e11f5
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 23, 2024
5a0b0cd
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 28, 2024
b9be47e
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 28, 2024
ca07874
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 28, 2024
0f9d7d5
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 29, 2024
5207560
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 29, 2024
63249b9
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 29, 2024
62aff8e
Merge branch 'campaign' of https://github.com/egovernments/DIGIT-Fron…
nitish-egov May 29, 2024
7e48280
trimmed underscore and empty spaces
nitish-egov May 29, 2024
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: 3 additions & 3 deletions utilities/project-factory/src/server/utils/genericUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,10 +746,10 @@ function modifyBoundaryData(boundaryData: unknown[], localizationMap?: any) {
boundaryData.forEach((obj: any) => {
// Convert object entries to an array of {key, value} objects
const row: any = Object.entries(obj)
.filter(([key, value]) => value !== null && value !== undefined)
.map(([key, value]) => ({ key, value }));
.filter(([key, value]) => key !== getLocalizedName(config?.boundary?.boundaryCode,localizationMap) && value !== null && value !== undefined)
.map(([key, value]: [string, any]) => ({ key, value: value.toString().replace(/_/g, ' ').trim() }));
Comment on lines +749 to +750
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor modifyBoundaryData to enhance readability and maintainability.

- .filter(([key, value]) =>  key !== getLocalizedName(config?.boundary?.boundaryCode,localizationMap) && value !== null && value !== undefined)
- .map(([key, value]: [string, any]) => ({ key, value: value.toString().replace(/_/g, ' ').trim() }));
+ .filter(([key, value]) => key !== getLocalizedName(config?.boundary?.boundaryCode, localizationMap) && value != null)
+ .map(([key, value]: [string, any]) => ({ key, value: value.toString().replace(/_/g, ' ').trim() }));

Consider using != null to check for both null and undefined in a more concise manner. Also, ensure consistent spacing around operators for better readability.

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
.filter(([key, value]) => key !== getLocalizedName(config?.boundary?.boundaryCode,localizationMap) && value !== null && value !== undefined)
.map(([key, value]: [string, any]) => ({ key, value: value.toString().replace(/_/g, ' ').trim() }));
.filter(([key, value]) => key !== getLocalizedName(config?.boundary?.boundaryCode, localizationMap) && value != null)
.map(([key, value]: [string, any]) => ({ key, value: value.toString().replace(/_/g, ' ').trim() }));


// Determine whether the object has a boundary code property
// Determine whether the object has a boundary code property
const hasBoundaryCode = obj.hasOwnProperty(getLocalizedName(config?.boundary?.boundaryCode, localizationMap));

// Push the row to the appropriate array based on whether it has a boundary code property
Expand Down
Loading