diff --git a/src/components/Project/Infrastructure/WorkItem.jsx b/src/components/Project/Infrastructure/WorkItem.jsx index b353987b..90383e14 100644 --- a/src/components/Project/Infrastructure/WorkItem.jsx +++ b/src/components/Project/Infrastructure/WorkItem.jsx @@ -4,12 +4,12 @@ import { useParams } from "react-router-dom"; import EditActivityModal from "./EditActivityModal"; import { useHasUserPermission } from "../../../hooks/useHasUserPermission"; import { MANAGE_PROJECT_INFRA, MANAGE_TASK } from "../../../utils/constants"; -import DleleteActivity from "./DleleteActivity"; + import ConfirmModal from "../../common/ConfirmModal"; import ProjectRepository from '../../../repositories/ProjectRepository' import {useProjectDetails} from '../../../hooks/useProjects' import showToast from "../../../services/toastService"; -import {cacheData} from "../../../slices/apiDataManager"; +import {cacheData, getCachedData} from "../../../slices/apiDataManager"; import {useDispatch} from "react-redux"; import {refreshData} from "../../../slices/localVariablesSlice"; @@ -23,9 +23,10 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => { const ManageTasks = useHasUserPermission(MANAGE_TASK); const ManageInfra = useHasUserPermission( MANAGE_PROJECT_INFRA ); const [ loadingDelete, setLoadingDelete ] = useState( false ) + const project = getCachedData("projectInfo"); const dispatch = useDispatch() - const {projects_Details} = useProjectDetails(projectId) + const {projects_Details} = useProjectDetails(projectId || project?.projectId) const openModal = () => setIsModalOpen(true); const closeModal = () => setIsModalOpen(false); @@ -63,7 +64,6 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => { const showModalDelete = () => setShowModal2(true); const closeModalDelete = () => setShowModal2( false ); -console.log(workItem) const handleSubmit = async() => { setLoadingDelete(true); @@ -102,28 +102,26 @@ console.log(workItem) : building ), }; - - console.log(newProject) + cacheData("projectInfo", { projectId: newProject.id, data: newProject, }); dispatch( refreshData( true ) ); - + closeModalDelete() setLoadingDelete(false) - showToast("Activity Updated Successfully","success") - - + showToast("Activity Deleted Successfully","success") } catch ( error ) { - setLoadingDelete(false) + setLoadingDelete( false ) + closeModalDelete() const message = error.response?.data?.message || error.message || "An unexpected error occurred"; showToast( message, "error" ); - console.log(error) + } }; return ( @@ -156,6 +154,7 @@ console.log(workItem) /> } + {showModal2 &&
- {/* */} - +
}