admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Conversation 0 Commits 249 Files Changed 74 +21 -14
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dce477f6cd - Show all commits

15
src/components/Expenses/ViewExpense.jsx
View File

@ -15,6 +15,7 @@ const ViewExpense = ({ ExpenseId }) => {
register, register,
handleSubmit, handleSubmit,
setValue, setValue,
reset,
formState: { errors }, formState: { errors },
} = useForm({ } = useForm({
resolver: zodResolver(ActionSchema), resolver: zodResolver(ActionSchema),
@ -24,11 +25,11 @@ const ViewExpense = ({ ExpenseId }) => {
}, },
}); });
const { mutate: MakeAction } = useActionOnExpense(); const { mutate: MakeAction } = useActionOnExpense(()=>reset());
const onSubmit = (formData) => { const onSubmit = (formData) => {
const Payload = { const Payload = {
expenseId: ExpenseId?.id, expenseId: ExpenseId,
statusId: formData.selectedStatus, statusId: formData.selectedStatus,
comment: formData.comment, comment: formData.comment,
}; };
@ -241,7 +242,7 @@ const ViewExpense = ({ ExpenseId }) => {
<input type="hidden" {...register("selectedStatus")} /> <input type="hidden" {...register("selectedStatus")} />
<div className="d-flex flex-wrap gap-2 my-2"> <div className="text-center flex-wrap gap-2 my-2">
{data.nextStatus.map((status, index) => ( {data.nextStatus.map((status, index) => (
<button <button
key={index} key={index}
@ -250,12 +251,8 @@ const ViewExpense = ({ ExpenseId }) => {
setValue("selectedStatus", status.id); setValue("selectedStatus", status.id);
handleSubmit(onSubmit)(); handleSubmit(onSubmit)();
}} }}
className="badge cursor-pointer border-0" className="btn btn-primary btn-sm cursor-pointer mx-2 border-0"
style={{
backgroundColor: status.color || "#6c757d",
color: "#fff",
fontSize: "0.85rem",
}}
> >
{status.displayName || status.name} {status.displayName || status.name}
</button> </button>

20
src/hooks/useExpense.js
View File

@ -101,9 +101,9 @@ export const useUpdateExpense = (onSuccessCallBack) => {
// }; // };
// } // }
// ); // );
queryClient.removeQueries({queryKey:['Expense', variables.id]}); queryClient.removeQueries({ queryKey: ["Expense", variables.id] });
queryClient.invalidateQueries({queryKey:['Expenses']}) queryClient.invalidateQueries({ queryKey: ["Expenses"] });
showToast('Expense updated Successfully', 'success'); showToast("Expense updated Successfully", "success");
if (onSuccessCallBack) onSuccessCallBack(); if (onSuccessCallBack) onSuccessCallBack();
}, },
@ -119,11 +119,11 @@ export const useActionOnExpense = (onSuccessCallBack) => {
return response.data; return response.data;
}, },
onSuccess: (updatedExpense, variables) => { onSuccess: (updatedExpense, variables) => {
showToast("Expense updated successfully", "success"); showToast("Request processed successfully.", "success");
queryClient.setQueriesData( queryClient.setQueriesData(
{ {
queryKey: ["expenses"], queryKey: ["Expenses"],
exact: false, exact: false,
}, },
(oldData) => { (oldData) => {
@ -142,6 +142,16 @@ export const useActionOnExpense = (onSuccessCallBack) => {
}; };
} }
); );
queryClient.setQueriesData(
{ queryKey: ["Expense", updatedExpense.id] },
(oldData) => {
return {
...oldData,
nextStatus: updatedExpense.nextStatus,
status: updatedExpense.status,
};
}
);
if (onSuccessCallBack) onSuccessCallBack(); if (onSuccessCallBack) onSuccessCallBack();
}, },