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

Handle undefined 'variables' in employee assignment toast logic

Browse Source
This commit is contained in:
Pramod Mahajan 2025-07-03 13:16:01 +05:30
parent e24b873677
commit e6d6f0ac30
3 changed files with 166 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/components/Activities/ReportTask.jsx
View File

@ -1,17 +1,16 @@
import React, { useState,useEffect } from "react"; import React, { useState, useEffect } from "react";
import { formatDate } from "../../utils/dateUtils"; import { formatDate } from "../../utils/dateUtils";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod"; import { z } from "zod";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
import { TasksRepository } from "../../repositories/TaskRepository"; import { TasksRepository } from "../../repositories/TaskRepository";
import {useReportTask} from "../../hooks/useTasks"; import { useReportTask } from "../../hooks/useTasks";
export const ReportTask = ({ report, closeModal }) => { export const ReportTask = ({ report, closeModal }) => {
const [ loading, setloading ] = useState( false ); const [loading, setloading] = useState(false);
const { mutate: reportTask, isPending } = useReportTask({ const { mutate: reportTask, isPending } = useReportTask({
onSuccessCallback: () => { onSuccessCallback: () => {
// refetch();
reset(); reset();
setloading(false); setloading(false);
closeModal(); closeModal();
@ -19,15 +18,17 @@ export const ReportTask = ({ report, closeModal }) => {
onErrorCallback: () => { onErrorCallback: () => {
setloading(false); setloading(false);
}, },
} ); });
const maxPending = const maxPending =
report?.workItem?.plannedWork - report?.workItem?.completedWork; report?.workItem?.plannedWork - report?.workItem?.completedWork;
const schema = z.object({ const schema = z.object({
completedTask: z completedTask: z.preprocess(
.preprocess( (val) =>
(val) => (val === "" || val === null || Number.isNaN(val) ? undefined : Number(val)), val === "" || val === null || Number.isNaN(val)
? undefined
: Number(val),
z z
.number({ .number({
required_error: "Completed Work must be a number", required_error: "Completed Work must be a number",
@ -39,49 +40,23 @@ export const ReportTask = ({ report, closeModal }) => {
}) })
), ),
comment: z.string().min(1, "Comment cannot be empty"), comment: z.string().min(1, "Comment cannot be empty"),
}); });
const { const {
register, register,
handleSubmit, handleSubmit,
formState: {errors}, formState: { errors },
reset reset,
} = useForm({ } = useForm({
resolver: zodResolver(schema), resolver: zodResolver(schema),
defaultValues: { completedTask: 0, comment: "" }, defaultValues: { completedTask: 0, comment: "" },
}); });
useEffect(() => {
useEffect(() => {
if (report) { if (report) {
reset({ completedTask: 0, comment: "" }); reset({ completedTask: 0, comment: "" });
} }
}, [report, reset]); }, [report, reset]);
// const onSubmit = async (data) => {
// try {
// setloading(true);
// const reportData = {
// ...data,
// id: report?.id,
// reportedDate: new Date().toISOString(),
// checkList: [],
// };
// let response = await TasksRepository.reportTask(reportData);
// showToast("Task Reported Successfully.", "success");
// refetch();
// reset()
// setloading(false);
// closeModal();
// } catch ( error )
// {
// const msg = error.response.data.message || error.message || "Error Occur During Api Call"
// showToast(msg, "error");
// }
// }
const onSubmit = (data) => { const onSubmit = (data) => {
setloading(true); setloading(true);
@ -92,25 +67,20 @@ useEffect(() => {
checkList: [], checkList: [],
}; };
reportTask(reportData); reportTask({ reportData, workAreaId: report?.workItem?.workArea?.id });
}; };
const handleClose = () => { const handleClose = () => {
closeModal(); closeModal();
reset(); reset();
}; };
return ( return (
<div className="container m-0"> <div className="container m-0">
<div className="text-center"> <div className="text-center">
<p className="fs-6 fw-semibold">Report Task</p> <p className="fs-6 fw-semibold">Report Task</p>
</div> </div>
<div className="mb-1 row text-start"> <div className="mb-1 row text-start">
<label <label htmlFor="html5-text-input" className="col-md-4 col-form-label">
htmlFor="html5-text-input"
className="col-md-4 col-form-label"
>
Assigned Date :{" "} Assigned Date :{" "}
</label> </label>
<div className="col-md-8 text-start"> <div className="col-md-8 text-start">
@ -120,10 +90,7 @@ useEffect(() => {
</div> </div>
</div> </div>
<div className="mb-1 row text-start"> <div className="mb-1 row text-start">
<label <label htmlFor="html5-search-input" className="col-md-4 col-form-label">
htmlFor="html5-search-input"
className="col-md-4 col-form-label"
>
Assigned By :{" "} Assigned By :{" "}
</label> </label>
<div className="col-md-8 text-start"> <div className="col-md-8 text-start">
@ -131,10 +98,7 @@ useEffect(() => {
</div> </div>
</div> </div>
<div className="mb-1 row text-start"> <div className="mb-1 row text-start">
<label <label htmlFor="html5-email-input" className="col-md-4 col-form-label">
htmlFor="html5-email-input"
className="col-md-4 col-form-label"
>
Wrok Area : Wrok Area :
</label> </label>
<div className="col-md-8 text-start text-wrap"> <div className="col-md-8 text-start text-wrap">
@ -149,10 +113,7 @@ useEffect(() => {
</div> </div>
</div> </div>
<div className="mb-1 row text-start"> <div className="mb-1 row text-start">
<label <label htmlFor="html5-email-input" className="col-md-4 col-form-label">
htmlFor="html5-email-input"
className="col-md-4 col-form-label"
>
Activity : Activity :
</label> </label>
<div className="col-md-8 text-start text-wrap"> <div className="col-md-8 text-start text-wrap">
@ -162,10 +123,7 @@ useEffect(() => {
</div> </div>
</div> </div>
<div className="mb-1 row text-start"> <div className="mb-1 row text-start">
<label <label htmlFor="html5-email-input" className="col-md-4 col-form-label">
htmlFor="html5-email-input"
className="col-md-4 col-form-label"
>
Team Size : Team Size :
</label> </label>
<div className="col-md-8 text-start text-wrap"> <div className="col-md-8 text-start text-wrap">
@ -175,17 +133,13 @@ useEffect(() => {
</div> </div>
</div> </div>
<div className="mb-1 row text-start"> <div className="mb-1 row text-start">
<label <label htmlFor="html5-email-input" className="col-md-4 col-form-label">
htmlFor="html5-email-input"
className="col-md-4 col-form-label"
>
Assigned : Assigned :
</label> </label>
<div className="col-md-8 text-start text-wrap"> <div className="col-md-8 text-start text-wrap">
<label className=" col-form-label"> <label className=" col-form-label">
{report?.plannedTask} of{" "} {report?.plannedTask} of{" "}
{report?.workItem.plannedWork - {report?.workItem.plannedWork - report?.workItem.completedWork}{" "}
report?.workItem.completedWork}{" "}
Pending Pending
</label> </label>
</div> </div>
@ -207,9 +161,7 @@ useEffect(() => {
placeholder="Completed Work" placeholder="Completed Work"
/> />
{errors.completedTask && ( {errors.completedTask && (
<div className="danger-text"> <div className="danger-text">{errors.completedTask.message}</div>
{errors.completedTask.message}
</div>
)} )}
</div> </div>
</div> </div>
@ -247,6 +199,5 @@ useEffect(() => {
</div> </div>
</form> </form>
</div> </div>
); );
}; };

5
src/hooks/useProjects.js
View File

@ -459,14 +459,15 @@ export const useManageProjectAllocation = ({
isSuccess, isSuccess,
isError, isError,
} = useMutation({ } = useMutation({
mutationFn: async ({ items }) => { mutationFn: async ( {items} ) =>
{
const response = await ProjectRepository.manageProjectAllocation(items); const response = await ProjectRepository.manageProjectAllocation(items);
return response.data; return response.data;
}, },
onSuccess: (data, variables, context) => { onSuccess: (data, variables, context) => {
queryClient.invalidateQueries(['empListByProjectAllocated']); queryClient.invalidateQueries(['empListByProjectAllocated']);
if (context?.added) { if (variables?.added) {
showToast('Employee Assigned Successfully', 'success'); showToast('Employee Assigned Successfully', 'success');
} else { } else {
showToast('Removed Employee Successfully', 'success'); showToast('Removed Employee Successfully', 'success');

112
src/hooks/useTasks.js
View File

@ -5,106 +5,7 @@ import {MasterRespository} from "../repositories/MastersRepository";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import showToast from "../services/toastService"; import showToast from "../services/toastService";
import {useSelector} from "react-redux"; import {useSelector} from "react-redux";
// import {formatDate} from "../utils/dateUtils";
// export const useTaskList = (projectId, dateFrom, toDate) => {
// const [TaskList, setTaskList] = useState([]);
// const [loading, setLoading] = useState(false);
// const [error, setError] = useState(null);
// const fetchList = async (projectId, dateFrom, toDate) => {
// const taskList_cached = getCachedData("taskList");
// // if (!taskList_cached || taskList_cached?.projectId !== projectId) {
// try {
// setLoading(true);
// const resp = await TasksRepository.getTaskList(
// projectId,
// dateFrom,
// toDate
// );
// setTaskList(resp.data);
// cacheData("taskList", { projectId: projectId, data: resp.data });
// setLoading(false);
// } catch (err) {
// setLoading(false);
// setError(err);
// }
// // } else {
// // setTaskList(taskList_cached.data);
// // }
// };
// useEffect( () =>
// {
// if (projectId && dateFrom && toDate) {
// fetchList(projectId, dateFrom, toDate);
// }
// }, [projectId, dateFrom, toDate]);
// return { TaskList, loading, error, refetch:fetchList};
// };
// export const useTaskById = (TaskId) =>
// {
// const [Task, setTask] = useState([]);
// const [loading, setLoading] = useState(false);
// const [ error, setError ] = useState( null );
// const fetchTask = async(TaskId) =>
// {
// try
// {
// let res = await TasksRepository.getTaskById( TaskId );
// setTask( res.data );
// } catch ( error )
// {
// setError(err)
// }
// }
// useEffect( () =>
// {
// if ( TaskId )
// {
// fetchTask(TaskId)
// }
// }, [ TaskId ] )
// return { Task,loading}
// }
// export const useAuditStatus = () =>
// {
// const [ status, setStatus ] = useState( [] );
// const [ error, setError ] = useState( '' );
// const [ loading, setLoading ] = useState( false )
// const fetchStatus = async() =>
// {
// try
// {
// const res = await MasterRespository.getAuditStatus()
// setStatus( res.data )
// cacheData("AuditStatus",res.data)
// } catch ( err )
// {
// setError(err)
// }
// }
// useEffect(() => {
// const cache_status = getCachedData('AuditStatus');
// if (cache_status) {
// setStatus(cache_status);
// } else {
// fetchStatus();
// }
// }, []);
// return {status,error,loading}
// }
// ---------Query--------------------------------- // ---------Query---------------------------------
@ -197,12 +98,17 @@ export const useReportTask = ( {onSuccessCallback, onErrorCallback} = {} ) =>
isError, isError,
error, error,
} = useMutation({ } = useMutation({
mutationFn: async (reportData) => { mutationFn: async ( {reportData,workAreaId} ) =>
{
debugger
return await TasksRepository.reportTask(reportData); return await TasksRepository.reportTask(reportData);
}, },
onSuccess: (data) => { onSuccess: ( data, variables ) =>
{
const {workAreaId} = variables;
queryClient.invalidateQueries( {queryKey: [ "taskList" ]} );
queryClient.invalidateQueries( {queryKey: [ "WorkItems", workAreaId ]} );
showToast( "Task Reported Successfully.", "success" ); showToast( "Task Reported Successfully.", "success" );
queryClient.invalidateQueries({ queryKey: ["taskList"] });
if (onSuccessCallback) onSuccessCallback(data); if (onSuccessCallback) onSuccessCallback(data);
}, },
onError: (error) => { onError: (error) => {
@ -247,7 +153,7 @@ export const useSubmitTaskComment = ({ actionAllow, onSuccessCallback }) => {
if (actionAllow) { if (actionAllow) {
showToast( "Review submitted successfully.", "success" ); showToast( "Review submitted successfully.", "success" );
queryClient.invalidateQueries({ queryKey: [ "WorkItems", workAreaId ] }); // queryClient.invalidateQueries({ queryKey: [ "WorkItems", workAreaId ] });
} else } else
{ {
showToast("Comment sent successfully.", "success"); showToast("Comment sent successfully.", "success");