Added generate bar data as a utility to reduce code duplication

Author: shashank-madan

src/components/Reports/TotalReport/TotalContributorsReport.jsx

@@ -5,6 +5,7 @@ import './TotalReport.css';
 import TotalReportBarGraph from './TotalReportBarGraph';
 import Loading from '../../common/Loading';
 import EditableInfoModal from '../../UserProfile/EditableModal/EditableInfoModal';
+import { generateBarData as generateBarDataUtil } from './generateBarData';
 
 function TotalContributorsReport({ startDate, endDate, userProfiles, darkMode, userRole }) {
   const [contributors, setContributors] = useState([]);
@@ -169,25 +170,7 @@ function TotalContributorsReport({ startDate, endDate, userProfiles, darkMode, u
 
   // Generate bar chart data
   const generateBarData = useCallback((groupedDate, isYear = false) => {
-    if (isYear) {
-      const startMonth = startDate.getMonth();
-      const endMonth = endDate.getMonth();
-      const sumData = groupedDate.map(range => ({
-        label: range.timeRange,
-        value: range.usersOfTime.length,
-        months: 12,
-      }));
-      if (sumData.length > 1) {
-        sumData[0].months = 12 - startMonth;
-        sumData[sumData.length - 1].months = endMonth + 1;
-      }
-      const filteredData = sumData.filter(data => data.value > 0);
-      return filteredData;
-    }
-    return groupedDate.map(range => ({
-      label: range.timeRange,
-      value: range.usersOfTime.length,
-    }));
+    return generateBarDataUtil(groupedDate, isYear, startDate, endDate, 'usersOfTime');
   }, [startDate, endDate]);
 
   // Check if we should show monthly/yearly summaries

src/components/Reports/TotalReport/TotalPeopleReport.jsx

@@ -7,6 +7,7 @@ import { Button } from 'reactstrap';
 import ReactTooltip from 'react-tooltip';
 import TotalReportBarGraph from './TotalReportBarGraph';
 import Loading from '../../common/Loading';
+import { generateBarData as generateBarDataUtil } from './generateBarData';
 
 function TotalPeopleReport(props) {
   const { startDate, endDate, userProfiles, darkMode } = props;
@@ -243,25 +244,7 @@ function TotalPeopleReport(props) {
 
   const generateBarData = useCallback(
     (groupedDate, isYear = false) => {
-      if (isYear) {
-        const startMonth = startDate.getMonth();
-        const endMonth = endDate.getMonth();
-        const sumData = groupedDate.map(range => ({
-          label: range.timeRange,
-          value: range.usersOfTime.length,
-          months: 12,
-        }));
-        if (sumData.length > 1) {
-          sumData[0].months = 12 - startMonth;
-          sumData[sumData.length - 1].months = endMonth + 1;
-        }
-        const filteredData = sumData.filter(data => data.value > 0);
-        return filteredData;
-      }
-      return groupedDate.map(range => ({
-        label: range.timeRange,
-        value: range.usersOfTime.length,
-      }));
+      return generateBarDataUtil(groupedDate, isYear, startDate, endDate, 'usersOfTime');
     },
     [startDate, endDate],
   );

src/components/Reports/TotalReport/TotalProjectReport.jsx

@@ -7,6 +7,7 @@ import { Button } from 'reactstrap';
 import ReactTooltip from 'react-tooltip';
 import TotalReportBarGraph from './TotalReportBarGraph';
 import Loading from '../../common/Loading';
+import { generateBarData as generateBarDataUtil } from './generateBarData';
 
 function TotalProjectReport(props) {
   const { startDate, endDate, userProfiles, projects, darkMode } = props;
@@ -235,25 +236,7 @@ function TotalProjectReport(props) {
 
   const generateBarData = useCallback(
     (groupedDate, isYear = false) => {
-      if (isYear) {
-        const startMonth = startDate.getMonth();
-        const endMonth = endDate.getMonth();
-        const sumData = groupedDate.map(range => ({
-          label: range.timeRange,
-          value: range.projectsOfTime.length,
-          months: 12,
-        }));
-        if (sumData.length > 1) {
-          sumData[0].months = 12 - startMonth;
-          sumData[sumData.length - 1].months = endMonth + 1;
-        }
-        const filteredData = sumData.filter(data => data.value > 0);
-        return filteredData;
-      }
-      return groupedDate.map(range => ({
-        label: range.timeRange,
-        value: range.projectsOfTime.length,
-      }));
+      return generateBarDataUtil(groupedDate, isYear, startDate, endDate, 'projectsOfTime');
     },
     [startDate, endDate],
   );

src/components/Reports/TotalReport/TotalTeamReport.jsx

@@ -5,6 +5,7 @@ import './TotalReport.css';
 import { Button } from 'reactstrap';
 import ReactTooltip from 'react-tooltip';
 import Loading from '../../common/Loading';
+import { generateBarData as generateBarDataUtil } from './generateBarData';
 
 const LazyTotalReportBarGraph = React.lazy(() => import('./TotalReportBarGraph'));
 
@@ -237,11 +238,8 @@ function TotalTeamReport(props) {
     }, []);
   };
 
-  const generateBarData = groupedData => {
-    return groupedData.map(range => ({
-      label: `${range.timeRange}`,
-      value: range.teamsOfTime.length,
-    }));
+  const generateBarData = (groupedData, isYear = false) => {
+    return generateBarDataUtil(groupedData, isYear, startDate, endDate, 'teamsOfTime');
   };
   // Filter teams by end date to remove those created after the selected period
   const filterTeamByEndDate = (teams, endDateTime) => {

src/components/Reports/TotalReport/generateBarData.js

@@ -0,0 +1,31 @@
+/**
+ * Shared utility function to generate bar chart data for reports
+ * @param {Array} groupedDate - Array of grouped data by time range
+ * @param {boolean} isYear - Whether this is yearly data
+ * @param {Date} startDate - Start date of the period
+ * @param {Date} endDate - End date of the period
+ * @param {string} dataProperty - Property name to access the data array (e.g., 'usersOfTime', 'projectsOfTime', 'teamsOfTime')
+ * @returns {Array} Array of bar chart data objects with label and value
+ */
+export const generateBarData = (groupedDate, isYear, startDate, endDate, dataProperty) => {
+  if (isYear) {
+    const startMonth = startDate.getMonth();
+    const endMonth = endDate.getMonth();
+    const sumData = groupedDate.map(range => ({
+      label: range.timeRange,
+      value: range[dataProperty]?.length || 0,
+      months: 12,
+    }));
+    if (sumData.length > 1) {
+      sumData[0].months = 12 - startMonth;
+      sumData[sumData.length - 1].months = endMonth + 1;
+    }
+    const filteredData = sumData.filter(data => data.value > 0);
+    return filteredData;
+  }
+  return groupedDate.map(range => ({
+    label: range.timeRange,
+    value: range[dataProperty]?.length || 0,
+  }));
+};
+