diff --git a/src/components/ServiceProject/JobList.jsx b/src/components/ServiceProject/JobList.jsx index 5e19a5b6..c596c840 100644 --- a/src/components/ServiceProject/JobList.jsx +++ b/src/components/ServiceProject/JobList.jsx @@ -28,28 +28,26 @@ const JobList = ({ isArchive }) => { ); const [isArchiveModalOpen, setIsArchiveModalOpen] = useState(false); const [archiveJobId, setArchiveJobId] = useState(null); - + const [isArchiveAction, setIsArchiveAction] = useState(true); const handleArchive = () => { const payload = [ { op: "replace", path: "/isArchive", - value: true, + value: isArchiveAction, }, ]; - UpdateJob({ id: archiveJobId, payload, - isArchiveAction: true, + isArchiveAction, }); setIsArchiveModalOpen(false); setArchiveJobId(null); }; - const jobGrid = [ { key: "jobTicketUId", @@ -123,17 +121,21 @@ const JobList = ({ isArchive }) => { return ( <> - {isArchiveModalOpen && ( setIsArchiveModalOpen(false)} loading={false} /> + )}
@@ -170,6 +172,7 @@ const JobList = ({ isArchive }) => { onClick={() => setSelectedJob({ showCanvas: true, job: row?.id }) } + > {col.getValue(row)} @@ -183,30 +186,48 @@ const JobList = ({ isArchive }) => {
- - <> - - - {canArchive(row?.status?.id) && ( + {!isArchive && ( + <> + + + + + )} + + {isArchive && ( + )} + + {!isArchive && canArchive(row?.status?.id) && ( +
+
diff --git a/src/hooks/useServiceProject.jsx b/src/hooks/useServiceProject.jsx index e90d3cb5..82bc5713 100644 --- a/src/hooks/useServiceProject.jsx +++ b/src/hooks/useServiceProject.jsx @@ -264,7 +264,6 @@ export const useCreateServiceProjectJob = (onSuccessCallback) => { export const useUpdateServiceProjectJob = (onSuccessCallback) => { const queryClient = useQueryClient(); - return useMutation({ mutationFn: async ({ id, payload, isArchiveAction = false }) => { const resp = await ServiceProjectRepository.UpdateJob(id, payload); @@ -281,10 +280,11 @@ export const useUpdateServiceProjectJob = (onSuccessCallback) => { if (isArchiveAction) { showToast("Job archived successfully", "success"); } else { - showToast("Job Updated successfully", "success"); + showToast("Job restored successfully", "success"); } }, + onError: (error) => { showToast( error?.response?.data?.message || @@ -336,10 +336,10 @@ export const useBranches = ( }); }; -export const useBranchTypes = ()=>{ +export const useBranchTypes = () => { return useQuery({ - queryKey:["branch_Type"], - queryFn:async()=> { + queryKey: ["branch_Type"], + queryFn: async () => { const resp = await ServiceProjectRepository.GetBranchTypeList(); return resp.data; }, @@ -409,9 +409,9 @@ export const useDeleteBranch = () => { mutationFn: async ({ id, isActive }) => await ServiceProjectRepository.DeleteBranch(id, isActive), - onSuccess: (_,variable) => { + onSuccess: (_, variable) => { queryClient.invalidateQueries({ queryKey: ["branches"] }); - showToast(`Branch ${variable.isActive ? "restored":"deleted"} successfully`, "success"); + showToast(`Branch ${variable.isActive ? "restored" : "deleted"} successfully`, "success"); }, onError: (error) => {