Merge pull request #3958 from OneCommunityGlobal/Amalesh-contributors-report

Amalesh - Fixed the issue with displaying the “Contributors Report”

Author: one-community

src/components/Reports/Reports.jsx

@@ -453,7 +453,8 @@ class ReportsPage extends Component {
       showAddTimeForm: false,
       showAddProjHistory: false,
       showAddPersonHistory: false,
-      showAddTeamHistory: false
+      showAddTeamHistory: false,
+      showCharts: !prevState.showContributorsReport
     }));
   }
 

src/components/Reports/TotalReport/TotalContributorsReport.jsx

@@ -21,17 +21,25 @@ function TotalContributorsReport({ startDate, endDate, userProfiles, darkMode, u
 
   // Fetch time entries for the selected period
   const loadTimeEntriesForPeriod = useCallback(async (controller) => {
+    const url = ENDPOINTS.TIME_ENTRIES_REPORTS;
+
+    if (!url) {
+      return;
+    }
     try {
       const response = await axios.post(
-        `${ENDPOINTS.APIEndpoint()}/TimeEntry/reports`,
-        {
-          fromDate,
-          toDate,
-          userList,
-        },
+        url,
+        { users: userList, fromDate, toDate },
         { signal: controller.signal }
       );
-      setTimeEntries(response.data);
+      const mappedTimeEntries = response.data.map(entry => ({
+        userId: entry.personId,
+        hours: entry.hours,
+        minutes: entry.minutes,
+        isTangible: entry.isTangible,
+        date: entry.dateOfWork,
+      }));
+      setTimeEntries(mappedTimeEntries);
     } catch (error) {
       // eslint-disable-next-line import/no-named-as-default-member
       if (!axios.isCancel(error)) {