Skip to content

Commit b9b8764

Browse files
modify api calls to correctly fetch people and project reports
1 parent 74b54a2 commit b9b8764

2 files changed

Lines changed: 30 additions & 7 deletions

File tree

src/actions/userManagement.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,14 +290,14 @@ export const updateUserFinalDayStatusIsSet = (user, status, finalDayDate, isSet)
290290
* fetching all user profiles basic info
291291
* Added `source` parameter to identify the calling component.
292292
*/
293-
export const getUserProfileBasicInfo = ({userId,source}) => {
293+
export const getUserProfileBasicInfo = ({ userId, source }) => {
294294
// API request to fetch basic user profile information
295-
let userProfileBasicInfoPromise;
296-
if (userId)
295+
let userProfileBasicInfoPromise;
296+
if (userId)
297297
userProfileBasicInfoPromise = axios.get(`${ENDPOINTS.USER_PROFILE_BASIC_INFO}?userId=${userId}`);
298-
else if(source)
299-
userProfileBasicInfoPromise = axios.get(ENDPOINTS.USER_PROFILE_BASIC_INFO(source));
300-
else
298+
else if (source)
299+
userProfileBasicInfoPromise = axios.get(ENDPOINTS.USER_PROFILE_BASIC_INFO(source));
300+
else
301301
userProfileBasicInfoPromise = axios.get(ENDPOINTS.USER_PROFILE_BASIC_INFO);
302302

303303
return async dispatch => {

src/components/Reports/TotalReport/TotalPeopleReport.jsx

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,16 @@ function TotalPeopleReport(props) {
2525
const fromDate = useMemo(() => startDate.toLocaleDateString('en-CA'), [startDate]);
2626
const toDate = useMemo(() => endDate.toLocaleDateString('en-CA'), [endDate]);
2727

28-
const userList = useMemo(() => userProfiles.map(user => user._id), [userProfiles]);
28+
const userList = useMemo(() => {
29+
const list = userProfiles?.map(user => user._id) || [];
30+
// eslint-disable-next-line no-console
31+
console.log('TotalPeopleReport userList created:', {
32+
userProfilesLength: userProfiles?.length,
33+
userListLength: list.length,
34+
sampleUserIds: list.slice(0, 5),
35+
});
36+
return list;
37+
}, [userProfiles]);
2938

3039
const loadTimeEntriesForPeriod = useCallback(
3140
async controller => {
@@ -37,11 +46,23 @@ function TotalPeopleReport(props) {
3746
}
3847

3948
try {
49+
// eslint-disable-next-line no-console
50+
console.log('TotalPeopleReport API Request:', {
51+
url,
52+
payload: { users: userList, fromDate, toDate },
53+
usersCount: userList?.length,
54+
userProfilesCount: userProfiles?.length,
55+
});
4056
const res = await axios.post(
4157
url,
4258
{ users: userList, fromDate, toDate },
4359
{ signal: controller.signal },
4460
);
61+
// eslint-disable-next-line no-console
62+
console.log('TotalPeopleReport API Response:', {
63+
dataLength: res.data?.length,
64+
sampleData: res.data?.slice(0, 2),
65+
});
4566
const timeEntries = res.data.map(entry => ({
4667
userId: entry.personId,
4768
hours: entry.hours,
@@ -51,6 +72,8 @@ function TotalPeopleReport(props) {
5172
}));
5273
setAllTimeEntries(timeEntries);
5374
} catch (error) {
75+
// eslint-disable-next-line no-console
76+
console.error('TotalPeopleReport API Error:', error);
5477
setTotalPeopleReportDataLoading(false);
5578
}
5679
},

0 commit comments

Comments
 (0)