Merge pull request #4949 from OneCommunityGlobal/development

Frontend Release to Main [4.80]

Author: one-community

src/actions/__tests__/weeklySummaryEmailBCCAction.js.test.js

@@ -0,0 +1,67 @@
+import axios from 'axios';
+import configureMockStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+
+import * as types from '../../constants/WeeklySummaryEmailBccConstants';
+import { updateWeeklySummaryEmailAssignment } from '../weeklySummaryEmailBCCAction';
+
+vi.mock('axios');
+
+const mockStore = configureMockStore([thunk]);
+
+describe('updateWeeklySummaryEmailAssignment action creator', () => {
+  it('dispatches updated assignment when API returns wrapped assignment payload', async () => {
+    const store = mockStore({});
+    const updatedAssignment = {
+      _id: 'assignment-id',
+      email: 'updated@example.com',
+      assignedTo: { _id: 'user-id', firstName: 'Updated', lastName: 'User' },
+    };
+
+    axios.put.mockResolvedValue({
+      status: 200,
+      data: { assignment: updatedAssignment },
+    });
+
+    await store.dispatch(updateWeeklySummaryEmailAssignment('assignment-id', 'updated@example.com'));
+
+    expect(store.getActions()).toContainEqual({
+      type: types.UPDATE_WEEKLY_SUMMARY_EMAIL_ASSIGNMENT,
+      payload: updatedAssignment,
+    });
+  });
+
+  it('dispatches updated assignment when API returns assignment directly', async () => {
+    const store = mockStore({});
+    const updatedAssignment = {
+      _id: 'assignment-id',
+      email: 'updated@example.com',
+    };
+
+    axios.put.mockResolvedValue({
+      status: 200,
+      data: updatedAssignment,
+    });
+
+    await store.dispatch(updateWeeklySummaryEmailAssignment('assignment-id', 'updated@example.com'));
+
+    expect(store.getActions()).toContainEqual({
+      type: types.UPDATE_WEEKLY_SUMMARY_EMAIL_ASSIGNMENT,
+      payload: updatedAssignment,
+    });
+  });
+
+  it('dispatches error action when update fails', async () => {
+    const store = mockStore({});
+    const error = new Error('Network Error');
+
+    axios.put.mockRejectedValue(error);
+
+    await store.dispatch(updateWeeklySummaryEmailAssignment('assignment-id', 'updated@example.com'));
+
+    expect(store.getActions()).toContainEqual({
+      type: types.WEEKLY_SUMMARY_EMAIL_ASSIGNMENT_ERROR,
+      payload: error,
+    });
+  });
+});

src/actions/bmdashboard/equipmentActions.js

@@ -32,7 +32,7 @@ export const setErrors = payload => {
 };
 
 export const fetchEquipmentById = equipmentId => {
-  const url = ENDPOINTS.BM_EQUIPMENT_BY_ID(equipmentId);
+  const url = `${ENDPOINTS.BM_EQUIPMENT_BY_ID(equipmentId)}`;
   return async dispatch => {
     axios
       .get(url)
@@ -83,12 +83,12 @@ export const purchaseEquipment = async body => {
 export const updateMultipleEquipmentLogs = (projectId, bulkArr) => dispatch => {
   axios
     .put(
-      `${ENDPOINTS.BM_EQUIPMENT_LOGS}?project=${projectId}`, 
+      `${ENDPOINTS.BM_EQUIPMENT_LOGS}?project=${projectId}`,
       bulkArr
     )
     .then(res => {
-      dispatch(setEquipments(res.data)); 
-      toast.success('Equipment logs updated successfully!');  
+      dispatch(setEquipments(res.data));
+      toast.success('Equipment logs updated successfully!');
       return res.data;
     })
     .catch(err => {
@@ -98,6 +98,71 @@ export const updateMultipleEquipmentLogs = (projectId, bulkArr) => dispatch => {
     });
 }
 
+export const updateEquipment = (equipmentId, updateData) => async (dispatch, getState) => {
+  const url = `${ENDPOINTS.BM_EQUIPMENT_STATUS_UPDATE(equipmentId)}`;
+
+  try {
+    const state = getState();
+    let currentUserId = state?.auth?.user?.userid;
+
+    if (!currentUserId) {
+      currentUserId = state?.auth?.user?._id ||
+        state?.auth?.user?.id ||
+        state?.auth?._id ||
+        state?.auth?.id;
+    }
+
+    if (!currentUserId) {
+      const storedUserId = localStorage.getItem('userId');
+      if (storedUserId) {
+        currentUserId = storedUserId;
+      }
+    }
+
+    if (!currentUserId) {
+      const errorMsg = 'User not authenticated. Please log in.';
+      toast.error(errorMsg);
+      throw new Error(errorMsg);
+    }
+
+    const statusUpdateData = {
+      condition: updateData.condition,
+      lastUsedBy: updateData.lastUsedBy,
+      lastUsedFor: updateData.lastUsedFor,
+      replacementRequired: updateData.replacementRequired,
+      description: updateData.description || '',
+      notes: updateData.notes || '',
+      createdBy: currentUserId,
+    };
+
+    const res = await axios.put(url, statusUpdateData);
+
+    dispatch(setEquipment(res.data));
+    toast.success('Equipment status updated successfully!');
+    dispatch(fetchEquipmentById(equipmentId));
+
+    return res.data;
+  } catch (err) {
+
+    let errorMessage = 'Failed to update equipment status.';
+
+    if (err.response) {
+      errorMessage = err.response.data?.error ||
+        err.response.data?.message ||
+        err.response.statusText ||
+        errorMessage;
+      dispatch(setErrors(err.response.data));
+    } else if (err.request) {
+      errorMessage = 'No response from server. Please check your connection.';
+    } else {
+      errorMessage = err.message;
+    }
+
+    toast.error(errorMessage);
+    throw err;
+  }
+};
+
 export const updateEquipmentById = (equipmentId, updatedFields) => async dispatch => {
   dispatch({ type: UPDATE_EQUIPMENT_START });
   try {

src/actions/weeklySummaryEmailBCCAction.js

@@ -24,6 +24,11 @@ const weeklySummaryEmailBccError = error => ({
   payload: error,
 });
 
+const updateWeeklySummaryEmailBcc = assignment => ({
+  type: types.UPDATE_WEEKLY_SUMMARY_EMAIL_ASSIGNMENT,
+  payload: assignment,
+});
+
 // fetch all assignments
 export const getAllWeeklySummaryEmailAssignments = () => {
   const url = ENDPOINTS.WEEKLY_SUMMARY_EMAIL_BCC();
@@ -79,11 +84,17 @@ export const updateWeeklySummaryEmailAssignment = (id, email) => async dispatch
   try {
     const response = await axios.put(ENDPOINTS.UPDATE_WEEKLY_SUMMARY_EMAIL_BCC(id), { email });
     if (response.status === 200) {
-      dispatch(getAllWeeklySummaryEmailAssignments());
+      const updated = response?.data?.assignment || response?.data || { _id: id, email };
+      if (updated && updated._id) {
+        dispatch(updateWeeklySummaryEmailBcc(updated));
+      } else {
+        dispatch(getAllWeeklySummaryEmailAssignments());
+      }
     } else {
       dispatch(weeklySummaryEmailBccError(response.data));
     }
   } catch (error) {
     dispatch(weeklySummaryEmailBccError(error));
   }
 };
+

src/components/BMDashboard/BMDashboard.jsx

@@ -4,6 +4,7 @@ import { Container } from 'reactstrap';
 import { fetchBMProjects } from '../../actions/bmdashboard/projectActions';
 import ProjectsList from './Projects/ProjectsList';
 import ProjectSelectForm from './Projects/ProjectSelectForm';
+import ProjectStatusDonutChart from './ProjectStatus/ProjectStatusDonutChart';
 import BMError from './shared/BMError';
 import styles from './BMDashboard.module.css';
 
@@ -200,6 +201,7 @@ export function BMDashboard() {
         ) : (
           <>
             <ProjectSelectForm />
+            <ProjectStatusDonutChart />
             <ProjectsList />
           </>
         )}