Taariq: Fix filterColor persistence issue on change and refresh for Individual as well as bulk Selected filterColors Frontend.

package.json

@@ -29,7 +29,7 @@
     "@react-leaflet/core": "^2.1.0",
     "@reduxjs/toolkit": "^2.4.0",
     "@sentry/browser": "^9.15.0",
-    "@tanstack/react-query": "^5.85.3",
+    "@tanstack/react-query": "^5.90.3",
     "@tinymce/miniature": "^6.0.0",
     "@tinymce/tinymce-react": "^6.1.0",
     "ajv": "^8.0.0",
@@ -184,7 +184,7 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-testing-library": "^7.11.0",
     "eslint-plugin-vitest": "^0.5.4",
-    "husky": "^7.0.4",
+    "husky": "^9.1.7",
     "joi-browser": "^13.4.0",
     "jsdom": "^26.1.0",
     "lint-staged": "^16.1.5",

src/actions/weeklySummaries.js

@@ -1,5 +1,7 @@
 import axios from 'axios';
+import { toast } from 'react-toastify';
 import * as actions from '../constants/weeklySummaries';
+import * as reportActions from '../constants/weeklySummariesReport';
 import { ENDPOINTS } from '~/utils/URL';
 import { getUserProfileActionCreator } from './userProfile';
 
@@ -36,7 +38,7 @@ export const fetchWeeklySummariesError = error => ({
  * @param {ObjectId} userId The user id.
  */
 export const getWeeklySummaries = userId => {
-  const url = ENDPOINTS.USER_PROFILE(userId);
+  const url = ENDPOINTS.USER_PROFILE_FIXED(userId);
   return async dispatch => {
     dispatch(fetchWeeklySummariesBegin());
     try {
@@ -112,3 +114,215 @@ export const updateWeeklySummaries = (userId, weeklySummariesData) => {
     }
   };
 };
+
+// ========== WEEKLY SUMMARIES REPORT (from your old file) ==========
+
+/**
+ * Action to set the 'loading' flag to true for reports.
+ */
+export const fetchWeeklySummariesReportBegin = () => ({
+  type: reportActions.FETCH_SUMMARIES_REPORT_BEGIN,
+});
+
+/**
+ * This action is used to set the weekly summaries reports in store.
+ *
+ * @param {array} weeklySummariesData An array of all active users.
+ */
+export const fetchWeeklySummariesReportSuccess = weeklySummariesData => ({
+  type: reportActions.FETCH_SUMMARIES_REPORT_SUCCESS,
+  payload: { weeklySummariesData },
+});
+
+/**
+ * Handle the error case for reports.
+ *
+ * @param {Object} error The error object.
+ */
+export const fetchWeeklySummariesReportError = error => ({
+  type: reportActions.FETCH_SUMMARIES_REPORT_ERROR,
+  payload: { error },
+});
+
+/**
+ * Update one summary report
+ *
+ * @param {Object} updatedField the updated field object, dynamic
+ */
+export const updateSummaryReport = ({ _id, updatedField }) => ({
+  type: reportActions.UPDATE_SUMMARY_REPORT,
+  payload: { _id, updatedField },
+});
+
+// write server-truth user object into the store
+export const updateSummaryReportFromServerAction = (user) => ({
+  type: reportActions.UPDATE_SUMMARY_REPORT,
+  payload: { _id: user._id, updatedField: user },
+});
+/**
+ * Gets all active users' summaries + a few other selected fields from the userProfile that
+ * might be useful for the weekly summary report.
+ */
+export const getWeeklySummariesReport = (weekIndex = null) => {
+  return async dispatch => {
+    dispatch(fetchWeeklySummariesReportBegin());
+    try {
+      // Use the APIEndpoint from ENDPOINTS
+      let url = ENDPOINTS.WEEKLY_SUMMARIES_REPORT();
+
+      const timestamp = `ts=${Date.now()}`;
+      const separator = url.includes('?') ? '&' : '?';
+
+      if (weekIndex === null) {
+        url = `${url}${separator}${timestamp}`;
+      } else {
+        const separator = url.includes('?') ? '&' : '?';
+        url = `${url}${separator}week=${weekIndex}&${timestamp}`;
+      }
+
+      const response = await axios.get(url, {
+        headers: {
+          'Cache-Control': 'no-cache',
+          Pragma: 'no-cache',
+          Expires: '0',
+        },
+      });
+      // Adding this debug log to check if filterColors are coming back
+      // eslint-disable-next-line no-console
+      console.log('API Response:', response.data);
+      // eslint-disable-next-line no-console
+      console.log('FilterColors in response:', response.data.map(user => ({
+      id: user._id,
+      name: user.firstName + ' ' + user.lastName,
+      filterColor: user.filterColor
+    })));
+      dispatch(fetchWeeklySummariesReportSuccess(response.data));
+      return { status: response.status, data: response.data };
+    } catch (error) {
+      dispatch(fetchWeeklySummariesReportError(error));
+      return error.response ? error.response.status : 500;
+    }
+  };
+};
+
+// working
+// export const updateOneSummaryReport = (userId, fullUserPayload) => {
+//   // const url = ENDPOINTS.USER_PROFILE(userId);
+//   // return async dispatch => {
+//   //   const { data: userProfile } = await axios.get(url);
+//   //   const payload = { ...userProfile, ...updatedField };
+//   //   // eslint-disable-next-line no-console
+//   //   console.log('🛰 PUT payload being sent:', payload);
+//   //   const res = await axios.put(url, {
+//   //     ...userProfile,
+//   //     ...updatedField,
+//   //   });
+
+//   //   // 🔹 Step 4 debug: log backend response explicitly
+//   //   // eslint-disable-next-line no-console
+//   //   console.log('🔍 Backend returned after PUT:', res.data);
+//   //   // eslint-disable-next-line no-console
+//   //   console.log('✅ PUT response:', res.data);
+
+//   //   if (res.status === 200) {
+//   //     dispatch(updateSummaryReport({ _id: userId, updatedField }));
+//   //     // eslint-disable-next-line no-console
+//   //     console.log('🟢 Redux state updated with:', updatedField);
+//   //     return res;
+//   //   }
+
+//   //   throw new Error(`An error occurred while attempting to save the changes to the profile.`);
+//   // };
+//   const url = ENDPOINTS.USER_PROFILE(userId);
+//   return async dispatch => {
+//     // try {
+//     //   // Optional: fetch current user profile if needed
+//     //   // const { data: userProfile } = await axios.get(url);
+//     //   const state = getState();
+//     //   const allUsers = Array.isArray(state.weeklySummariesReport?.summaries)
+//     //     ? state.weeklySummariesReport.summaries
+//     //     : [];
+//     //   const currentUser = allUsers.find(u => u._id === userId);
+
+//     //   if (!currentUser) throw new Error('User not found in state');
+
+//     //   // Merge updatedField (like filterColor) into the full user object
+//     //   const payload = { ...currentUser, ...updatedField };
+
+//     //   // Send the PUT and get server response (server should return the saved user)
+//     //   // const res = await axios.put(url, {
+//     //   //   ...updatedField, // send only updated fields (you already normalized on client)
+//     //   // });
+//     //   const res = await axios.put(url, payload);
+//     //   // Log for debugging
+//     //   // eslint-disable-next-line no-console
+//     //   console.log('✅ PUT response (updateOneSummaryReport):', res.data);
+
+//     //   if (res.status === 200) {
+//     //     // Dispatch the server-truth into the store.
+//     //     // IMPORTANT: payload should be the full user object (or at least fields the UI needs)
+//     //     dispatch(updateSummaryReport({ _id: userId, updatedField: res.data }));
+
+//     //     // Return the server response so callers can use res.data
+//     //     return res;
+//     //   }
+
+//     //   throw new Error('Failed to save profile');
+//     // } catch (err) {
+//     //   // rethrow so caller's try/catch can handle revert
+//     //   throw err;
+//     // }
+//     //above was good byt not working code
+//     const res = await axios.put(url, fullUserPayload);
+//     if (res.status === 200) {
+//       dispatch(updateSummaryReport({ _id: userId, updatedField: res.data }));
+//       return res;
+//     }
+//     throw new Error('Failed to save profile');
+//   };
+// };
+export const updateOneSummaryReport = (userId, payload) => {
+  const url = ENDPOINTS.USER_PROFILE(userId);
+  return async dispatch => {
+    const res = await axios.put(url, payload); 
+    if (res.status === 200) {
+      dispatch(updateSummaryReport({ _id: userId, updatedField: res.data }));
+      return res;
+    }
+    throw new Error('Failed to save profile');
+  };
+};
+
+/**
+ * Toggle the user's bio status (posted, requested, default).
+ */
+export const toggleUserBio = (userId, bioPosted) => {
+  const url = ENDPOINTS.TOGGLE_BIO_STATUS(userId);
+  return async dispatch => {
+    try {
+      const res = await axios.patch(url, { bioPosted });
+
+      if (res.status === 200) {
+        const updatedField = { bioPosted };
+
+        // Dispatch an action to update the store
+        dispatch(updateSummaryReport({ _id: userId, updatedField }));
+
+        toast.success(`Bio status updated to "${bioPosted}"`);
+      }
+
+      return res;
+    } catch (error) {
+      toast.error('An error occurred while updating bio status.');
+      throw error;
+    }
+  };
+};
+
+/**
+ * Optimistically update filterColor for all users in selected team codes.
+ */
+export const updateBulkFilterColors = ({ color, teamCodes, newState }) => ({
+  type: reportActions.UPDATE_BULK_FILTER_COLORS,
+  payload: { color, teamCodes, newState },
+});

src/actions/weeklySummariesReport.js

@@ -44,21 +44,31 @@ export const updateSummaryReport = ({ _id, updatedField }) => ({
  * Gets all active users' summaries + a few other selected fields from the userProfile that
  * might be useful for the weekly summary report.
  */
-export const getWeeklySummariesReport = (weekIndex = null) => {
+export const getWeeklySummariesReport = (weekIndex = null, options = {}) => {
   return async dispatch => {
     dispatch(fetchWeeklySummariesReportBegin());
     try {
       // Use the APIEndpoint from ENDPOINTS
       let url = ENDPOINTS.WEEKLY_SUMMARIES_REPORT();
 
+      const timestamp = options.forceRefresh ? `ts=${Date.now()}` : '';
       // Add the week parameter if provided
       if (weekIndex !== null) {
         // Check if the URL already has parameters
         const separator = url.includes('?') ? '&' : '?';
-        url = `${url}${separator}week=${weekIndex}`;
+        url = `${url}${separator}week=${weekIndex}${timestamp ? '&' + timestamp : ''}`;
+      } else if (timestamp) {
+        const separator = url.includes('?') ? '&' : '?';
+        url = `${url}${separator}${timestamp}`;
       }
 
-      const response = await axios.get(url);
+      const response = await axios.get(url, {
+        headers: {
+          'Cache-Control': 'no-cache',
+          Pragma: 'no-cache',
+          Expires: '0',
+        },
+      });
       dispatch(fetchWeeklySummariesReportSuccess(response.data));
       return { status: response.status, data: response.data };
     } catch (error) {

src/components/BMDashboard/WeeklyProjectSummary/DistributionLaborHours/DistributionLaborHours.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-alert */
 import React, { useState, useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { PieChart, Pie, Cell, Tooltip, ResponsiveContainer } from 'recharts';

src/components/Timelog/__tests__/TimelogNavbar.test.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-named-as-default */
 import React from 'react';
 import { BrowserRouter as Router , Route } from 'react-router-dom';
 import { Provider } from 'react-redux';

src/components/TotalOrgSummary/TaskCompleted/TaskCompletedBarChart.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-alert */
 import TinyBarChart from '../TinyBarChart';
 import Loading from '../../common/Loading';
 

src/components/UserManagement/__tests__/SetUpFinalDayPopUp.test.jsx

@@ -5,6 +5,7 @@ import '@testing-library/jest-dom/extend-expect';
 import moment from 'moment';
 import { Provider } from 'react-redux';
 // eslint-disable import/no-named-as-default 
+// eslint-disable-next-line import/no-named-as-default
 import configureStore from 'redux-mock-store';
 import SetUpFinalDayPopUp from '../SetUpFinalDayPopUp.jsx';
 const mockStore = configureStore([]);