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

removed useMaster and dispatch from TaskModel after switching to useActivitiesMaster

Browse Source
This commit is contained in:
Pramod Mahajan 2025-05-04 00:01:02 +05:30
parent b1cb715c84
commit 1fea83b629
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/Project/Infrastructure/TaskModel.jsx
View File

@ -2,9 +2,7 @@ import React, { useState, useEffect } from "react";
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 { useDispatch } from "react-redux"; import {useActivitiesMaster} from "../../../hooks/masterHook/useMaster";
import { changeMaster } from "../../../slices/localVariablesSlice";
import useMaster, {useActivitiesMaster} from "../../../hooks/masterHook/useMaster";
const taskSchema = z.object({ const taskSchema = z.object({
buildingID: z.string().min(1, "Building is required"), buildingID: z.string().min(1, "Building is required"),
@ -32,8 +30,6 @@ const TaskModel = ({
onClearComplete, onClearComplete,
onClose, onClose,
}) => { }) => {
const dispatch = useDispatch();
const { data: activities } = useMaster();
const [formData, setFormData] = useState(defaultModel); const [formData, setFormData] = useState(defaultModel);
const [selectedBuilding, setSelectedBuilding] = useState(null); const [selectedBuilding, setSelectedBuilding] = useState(null);
const [selectedFloor, setSelectedFloor] = useState(null); const [selectedFloor, setSelectedFloor] = useState(null);
@ -41,7 +37,7 @@ const TaskModel = ({
const [selectedActivity, setSelectedActivity] = useState(null); const [selectedActivity, setSelectedActivity] = useState(null);
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const [ activityData, setActivityData ] = useState( [] ); const [ activityData, setActivityData ] = useState( [] );
const {activities: activitiesData, loading, error} = useActivitiesMaster(); const {activities, loading, error} = useActivitiesMaster();
@ -57,7 +53,6 @@ const TaskModel = ({
}); });
useEffect(() => { useEffect(() => {
dispatch(changeMaster("Activity"));
resetForm(); resetForm();
}, []); }, []);
@ -129,11 +124,11 @@ const TaskModel = ({
useEffect(() => { useEffect(() => {
if (!loading && Array.isArray(activitiesData) && activitiesData.length > 0) { if (!loading && Array.isArray(activities) && activities.length > 0) {
setActivityData(activitiesData); setActivityData(activities);
} }
}, [activitiesData, loading]); }, [activities, loading]);
return ( return (
<div className="modal-dialog modal-lg modal-simple modal-edit-user"> <div className="modal-dialog modal-lg modal-simple modal-edit-user">
@ -280,7 +275,7 @@ useEffect(() => {
</option> </option>
)) ))
) : ( ) : (
<option disabled>No activities available</option> // Fallback if activities are empty <option disabled>No activities available</option>
)} )}
</select> </select>
@ -290,7 +285,6 @@ useEffect(() => {
</div> </div>
)} )}
{/* Planned Work */}
{selectedActivity && ( {selectedActivity && (
<div className="col-5 col-md-5"> <div className="col-5 col-md-5">
<label className="form-label" htmlFor="plannedWork"> <label className="form-label" htmlFor="plannedWork">
@ -308,7 +302,6 @@ useEffect(() => {
</div> </div>
)} )}
{/* Completed Work */}
{selectedActivity && ( {selectedActivity && (
<div className="col-5 col-md-5"> <div className="col-5 col-md-5">
<label className="form-label" htmlFor="completedWork"> <label className="form-label" htmlFor="completedWork">