Skip to content

Commit 6aa4b85

Browse files
authored
Merge pull request #161 from soumiyarao/WV-2477
[WV-2477] Fix for c3/c4 distribution report not calculating correctly
2 parents 3bb196e + a16dc99 commit 6aa4b85

1 file changed

Lines changed: 24 additions & 12 deletions

File tree

src/js/pages/SystemSettings/ReportsPage.jsx

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,34 @@ export default function ReportsPage () {
8080
useEffect(() => {
8181
// Calculate statistics based on team membership and nonprofit status
8282
const teams = Object.values(allTeamsCache);
83-
const c3Team = teams.find((team) => team.isC3Nonprofit === true);
84-
const c4Team = teams.find((team) => team.isC4Nonprofit === true);
85-
86-
const c3TeamId = c3Team?.teamId;
87-
const c4TeamId = c4Team?.teamId;
88-
83+
const c3Teams = teams.filter((team) => team.isC3Nonprofit === true);
84+
const c4Teams = teams.filter((team) => team.isC4Nonprofit === true);
85+
// Get all c3 teamIds
86+
const c3TeamIds = c3Teams
87+
.map((team) => team.teamId)
88+
.filter((id) => id !== undefined && id !== null);
89+
90+
// Collect all members across all c3 teams
8991
const c3Members = new Set(
90-
(allTeamMembersCache[c3TeamId] || [])
91-
.map((member) => member.personId)
92-
.filter((id) => id !== undefined && id !== null),
92+
c3TeamIds.flatMap((teamId) => (
93+
(allTeamMembersCache[teamId] ?? [])
94+
.map((member) => member.personId)
95+
.filter((id) => id !== undefined && id !== null)
96+
)),
9397
);
9498

99+
// Get all c4 teamIds
100+
const c4TeamIds = c4Teams
101+
.map((team) => team.teamId)
102+
.filter((id) => id !== undefined && id !== null);
103+
104+
// Collect all members across all c4 teams
95105
const c4Members = new Set(
96-
(allTeamMembersCache[c4TeamId] || [])
97-
.map((member) => member.personId)
98-
.filter((id) => id !== undefined && id !== null),
106+
c4TeamIds.flatMap((teamId) => (
107+
(allTeamMembersCache[teamId] ?? [])
108+
.map((member) => member.personId)
109+
.filter((id) => id !== undefined && id !== null)
110+
)),
99111
);
100112

101113
let onBothTeamsCount = 0;

0 commit comments

Comments
 (0)