diff --git a/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx b/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx index 089d5b67..4e55618a 100644 --- a/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx +++ b/src/components/ServiceProject/ServiceProjectBranch/ServiceBranch.jsx @@ -50,7 +50,7 @@ const ServiceBranch = () => { const handleDelete = (id) => { setDeletingId(id); DeleteBranch( - { id, isActive: false }, + { id, isActive: showInactive }, { onSettled: () => { setDeletingId(null); @@ -64,9 +64,13 @@ const ServiceBranch = () => { {IsDeleteModalOpen && ( setIsDeleteModalOpen(false)} loading={isPending} @@ -182,35 +186,47 @@ const ServiceBranch = () => { > - diff --git a/src/components/common/ConfirmModal.jsx b/src/components/common/ConfirmModal.jsx index d2f10213..cc62535b 100644 --- a/src/components/common/ConfirmModal.jsx +++ b/src/components/common/ConfirmModal.jsx @@ -18,8 +18,10 @@ const ConfirmModal = ({ return ; case "success": return ; - case "warning": + case "archive": return ; + case "undo": + return ; default: return null; } diff --git a/src/hooks/useServiceProject.jsx b/src/hooks/useServiceProject.jsx index 293e5e8a..a87a827c 100644 --- a/src/hooks/useServiceProject.jsx +++ b/src/hooks/useServiceProject.jsx @@ -148,6 +148,11 @@ export const useAllocationServiceProjectTeam = (onSuccessCallback) => { //#endregion + + + + + //#region Service Jobs export const useServiceProjectJobs = ( @@ -292,6 +297,12 @@ export const useUpdateServiceProjectJob = (onSuccessCallback) => { //#endregion + + + + + + //#region Branch export const useBranches = ( projectId, @@ -396,9 +407,9 @@ export const useDeleteBranch = () => { mutationFn: async ({ id, isActive }) => await ServiceProjectRepository.DeleteBranch(id, isActive), - onSuccess: () => { + onSuccess: (_,variable) => { queryClient.invalidateQueries({ queryKey: ["branches"] }); - showToast("Branch deleted successfully", "success"); + showToast(`Branch ${variable.isActive ? "restored":"deleted"} successfully`, "success"); }, onError: (error) => {