resolving merge conflicts

Author: saisandeepkoritala

src/actions/bmdashboard/equipmentActions.js

@@ -88,7 +88,6 @@ export const updateMultipleEquipmentLogs = (projectId, bulkArr) => dispatch => {
     )
     .then(res => {
       dispatch(setEquipments(res.data));
-      toast.success('Equipment logs updated successfully!');
       return res.data;
     })
     .catch(err => {

src/actions/bmdashboard/invTypeActions.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { toast } from 'react-toastify';
 import GET_MATERIAL_TYPES, {
   POST_BUILDING_MATERIAL_INVENTORY_TYPE,
   POST_ERROR_BUILDING_MATERIAL_INVENTORY_TYPE,
@@ -182,11 +183,9 @@ export const fetchToolTypes = () => {
     axios
       .get(ENDPOINTS.BM_TOOL_TYPES)
       .then(res => {
-        // console.log("tool types: ", res)
         dispatch(setToolTypes(res.data));
       })
       .catch(err => {
-        // console.log("fetchToolTypes err: ", err)
         dispatch(setErrors(err));
       });
   };
@@ -201,7 +200,7 @@ export const fetchInvTypeByType = type => {
         dispatch(setInvTypesByType({ type, data: res.data }));
       })
       .catch(err => {
-        dispatch(setErrors(err));
+        console.error('Failed to refresh data:', err);
       });
   };
 };
@@ -275,14 +274,10 @@ export const postToolsLog = payload => {
     axios
       .post(ENDPOINTS.BM_LOG_TOOLS, payload)
       .then(res => {
-        // eslint-disable-next-line no-console
-        // eslint-disable-next-line no-use-before-define
         dispatch(setToolsLogResult(res.data));
       })
       .catch(err => {
         dispatch(
-          // setPostErrorToolsLog(JSON.stringify(err.response.data) || 'Sorry! Some error occurred!'),
-          // eslint-disable-next-line no-use-before-define
           setPostErrorToolsLog(err.response.data || 'Sorry! Some error occurred!'),
         );
       });
@@ -309,68 +304,94 @@ export const resetPostToolsLog = () => {
   };
 };
 
-// ============ Generic Inventory Type CRUD Actions ============
-
-/**
- * Add a new inventory type
- * @param {Object} payload - { name, description, category }
- * @param {string} category - The category (Materials, Consumables, Equipments, Reusables, Tools)
- */
-export const addInventoryType = (payload, category) => {
+export const deleteInvType = (type, invtypeId) => {
   return async dispatch => {
+    const toastId = `delete-${type}-${Date.now()}`;
     try {
-      const res = await axios.post(ENDPOINTS.BM_INVTYPE_ROOT, { ...payload, category });
-      dispatch({ type: ADD_INVENTORY_TYPE_SUCCESS, payload: res.data });
-      // Refresh the list for this category
-      dispatch(fetchInvTypeByType(category));
-      return { success: true, data: res.data };
+      await axios.delete(`${ENDPOINTS.BM_INVTYPE_TYPE(type)}/${invtypeId}`);
+      // Refresh the data after successful deletion
+      dispatch(fetchInvTypeByType(type));
+      toast.success(`${type.slice(0, -1)} deleted successfully!`, { toastId });
     } catch (err) {
-      const errorMsg = err.response?.data?.message || err.response?.data || 'Failed to add inventory type';
-      dispatch({ type: ADD_INVENTORY_TYPE_ERROR, payload: errorMsg });
-      return { success: false, error: errorMsg };
+      const errorMessage = err.response?.data?.error || err.response?.data?.message || 'Failed to delete item. Please try again.';
+      toast.error(errorMessage, { toastId: `delete-error-${type}-${Date.now()}` });
     }
   };
 };
 
-/**
- * Update an existing inventory type
- * @param {string} typeId - The ID of the inventory type
- * @param {Object} payload - { name, description }
- * @param {string} category - The category to refresh after update
- */
-export const updateInventoryType = (typeId, payload, category) => {
+export const updateInvType = (type, invtypeId, payload) => {
   return async dispatch => {
+    const toastId = `update-${type}-${Date.now()}`;
     try {
-      const res = await axios.put(ENDPOINTS.BM_INVTYPE_BY_ID(typeId), payload);
-      dispatch({ type: UPDATE_INVENTORY_TYPE_SUCCESS, payload: res.data });
-      // Refresh the list for this category
-      dispatch(fetchInvTypeByType(category));
-      return { success: true, data: res.data };
+      await axios.put(`${ENDPOINTS.BM_INVTYPE_TYPE(type)}/${invtypeId}`, payload);
+      // Refresh the data after successful update
+      dispatch(fetchInvTypeByType(type));
+      toast.success(`${type.slice(0, -1)} updated successfully!`, { toastId });
+    } catch (err) {
+      const errorMessage = err.response?.data?.error || err.response?.data?.message || 'Failed to update item. Please try again.';
+      toast.error(errorMessage, { toastId: `update-error-${type}-${Date.now()}` });
+    }
+  };
+};
+
+export const addInvType = (type, payload) => {
+  let endpoint;
+  switch (type) {
+    case 'Materials':
+      endpoint = ENDPOINTS.BM_MATERIAL_TYPE;
+      break;
+    case 'Consumables':
+      endpoint = ENDPOINTS.BM_CONSUMABLES;
+      break;
+    case 'Tools':
+      endpoint = ENDPOINTS.BM_TOOLS;
+      break;
+    case 'Equipments':
+      endpoint = ENDPOINTS.BM_EQUIPMENT_INVTYPE;
+      break;
+    case 'Reusables':
+      endpoint = ENDPOINTS.BM_REUSABLES_INVTYPE;
+      break;
+    default:
+      endpoint = ENDPOINTS.BM_MATERIAL_TYPE;
+  }
+
+  return async (dispatch, getState) => {
+    const toastId = `add-${type}-${Date.now()}`;
+    const { auth } = getState();
+    const requestorId = auth.user?.userid;
+
+    const body = { ...payload, requestor: { requestorId } };
+
+    if (type === 'Equipments') {
+      body.desc = body.description;
+      body.fuel = body.fuel || 'Diesel';
+    }
+
+    try {
+      await axios.post(endpoint, body);
+      dispatch(fetchInvTypeByType(type));
+      toast.success(`${type.slice(0, -1)} added successfully!`, { toastId });
     } catch (err) {
-      const errorMsg = err.response?.data?.message || err.response?.data || 'Failed to update inventory type';
-      dispatch({ type: UPDATE_INVENTORY_TYPE_ERROR, payload: errorMsg });
-      return { success: false, error: errorMsg };
+      const errorMessage = err.response?.data?.error || err.response?.data?.message || 'Failed to add item. Please try again.';
+      toast.error(errorMessage, { toastId: `add-error-${type}-${Date.now()}` });
     }
   };
 };
 
 /**
- * Delete an inventory type
- * @param {string} typeId - The ID of the inventory type
- * @param {string} category - The category to refresh after delete
+ * Delete an inventory type by ID and category.
+ * Used by DeleteInvTypeModal (param order: typeId, category).
  */
-export const deleteInventoryType = (typeId, category) => {
+export const deleteInventoryType = (invtypeId, category) => {
   return async dispatch => {
     try {
-      await axios.delete(ENDPOINTS.BM_INVTYPE_BY_ID(typeId));
-      dispatch({ type: DELETE_INVENTORY_TYPE_SUCCESS, payload: typeId });
-      // Refresh the list for this category
+      await axios.delete(`${ENDPOINTS.BM_INVTYPE_TYPE(category)}/${invtypeId}`);
       dispatch(fetchInvTypeByType(category));
       return { success: true };
     } catch (err) {
-      const errorMsg = err.response?.data?.message || err.response?.data || 'Failed to delete inventory type';
-      dispatch({ type: DELETE_INVENTORY_TYPE_ERROR, payload: errorMsg });
-      return { success: false, error: errorMsg };
+      const errorMessage = err.response?.data?.error || err.response?.data?.message || 'Failed to delete item.';
+      return { success: false, error: errorMessage };
     }
   };
 };

src/actions/bmdashboard/invUnitActions.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { toast } from 'react-toastify';
 
 import { ENDPOINTS } from '~/utils/URL';
 import {
@@ -45,21 +46,38 @@ export const fetchInvUnits = () => {
         dispatch(setInvUnits(res.data));
       })
       .catch(err => {
-        dispatch(setErrors(err));
+        // Don't show toast for internal refresh calls
       });
   };
 };
 
 export const postBuildingInventoryUnit = payload => {
   return async dispatch => {
-    axios
-      .post(ENDPOINTS.BM_INVENTORY_UNITS, payload)
-      .then(res => {
-        dispatch(setPostInvUnitResult(res.data));
-      })
-      .catch(err => {
-        dispatch(setErrors(err));
-      });
+    const toastId = `add-unit-${Date.now()}`;
+    try {
+      await axios.post(ENDPOINTS.BM_INVENTORY_UNITS, payload);
+      // Refresh the data after successful addition
+      dispatch(fetchInvUnits());
+      toast.success('Unit added successfully!', { toastId });
+    } catch (err) {
+      const errorMessage = err.response?.data?.error || err.response?.data?.message || 'Failed to add unit. Please try again.';
+      toast.error(errorMessage, { toastId: `add-unit-error-${Date.now()}` });
+    }
+  };
+};
+
+export const deleteInvUnit = (unitName) => {
+  return async dispatch => {
+    const toastId = `delete-unit-${Date.now()}`;
+    try {
+      await axios.delete(ENDPOINTS.BM_INVENTORY_UNITS, { data: { unit: unitName } });
+      // Refresh the data after successful deletion
+      dispatch(fetchInvUnits());
+      toast.success('Unit deleted successfully!', { toastId });
+    } catch (err) {
+      const errorMessage = err.response?.data?.error || err.response?.data?.message || 'Failed to delete unit. Please try again.';
+      toast.error(errorMessage, { toastId: `delete-unit-error-${Date.now()}` });
+    }
   };
 };