From 1fea83b6293d4307b0813040ba66e874b8c63a5c Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Sun, 4 May 2025 00:01:02 +0530
Subject: [PATCH] removed useMaster and dispatch from TaskModel after switching
 to useActivitiesMaster

---
 .../Project/Infrastructure/TaskModel.jsx      | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

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