Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default

src/components/Project/ProjectCard.jsx

@@ -14,34 +14,34 @@ import {
   getProjectStatusName,
 } from "../../utils/projectStatus";
 import GlobalModel from "../common/GlobalModel";
-	import { useDispatch } from "react-redux";
+import { useDispatch } from "react-redux";
 import { setProjectId } from "../../slices/localVariablesSlice";
 
 const ProjectCard = ({ projectData, recall }) => {
-  const [ projectInfo, setProjectInfo ] = useState( projectData );
+  const [projectInfo, setProjectInfo] = useState(projectData);
- const { projects_Details, loading, error, refetch } = useProjectDetails(
+  const { projects_Details, loading, error, refetch } = useProjectDetails(
-    projectInfo?.id,false
+    projectInfo?.id, false
   );
   const [showModal, setShowModal] = useState(false);
-  	  const  dispatch = useDispatch()
+  const dispatch = useDispatch()
   const navigate = useNavigate();
   const ManageProject = useHasUserPermission(MANAGE_PROJECT);
   const {
-   mutate: updateProject,
+    mutate: updateProject,
-   isPending,
+    isPending,
-   isSuccess,
+    isSuccess,
-   isError,
+    isError,
- } = useUpdateProject({
+  } = useUpdateProject({
-   onSuccessCallback: () => {
+    onSuccessCallback: () => {
-     setShowModal(false);
+      setShowModal(false);
-   },
+    },
- })
+  })
 
-  useEffect(()=>{
+  useEffect(() => {
     setProjectInfo(projectData);
-  }, [ projectData ] )
+  }, [projectData])
 
-   const handleShow = async () => {
+  const handleShow = async () => {
     try {
       const { data } = await refetch();
       setShowModal(true);
@@ -63,22 +63,26 @@ const ProjectCard = ({ projectData, recall }) => {
     dispatch(setProjectId(projectInfo.id))
     navigate(`/projects/details`);
   };
+  const handleViewActivities = () => {
+    dispatch(setProjectId(projectInfo.id))
+    navigate(`/activities/records?project=${projectInfo.id}`);
+  };
 
   const handleFormSubmit = (updatedProject) => {
-  if (projectInfo?.id) {
+    if (projectInfo?.id) {
-    updateProject({
+      updateProject({
-      projectId: projectInfo.id,
+        projectId: projectInfo.id,
-      updatedData: updatedProject,
+        updatedData: updatedProject,
-    });
+      });
-  }
+    }
-};
+  };
 
   return (
     <>
 
       {showModal && projects_Details && (
         <GlobalModel isOpen={showModal} closeModal={handleClose}>
-             <ManageProjectInfo
+          <ManageProjectInfo
             project={projects_Details}
             handleSubmitForm={handleFormSubmit}
             onClose={handleClose}
@@ -120,23 +124,23 @@ const ProjectCard = ({ projectData, recall }) => {
                     data-bs-toggle="dropdown"
                     aria-expanded="false"
                   >
-                        {loading ? (
+                    {loading ? (
-                <div
+                      <div
-                  className="spinner-border spinner-border-sm text-secondary"
+                        className="spinner-border spinner-border-sm text-secondary"
-                  role="status"
+                        role="status"
-                >
+                      >
-                  <span className="visually-hidden">Loading...</span>
+                        <span className="visually-hidden">Loading...</span>
-                </div>
+                      </div>
-              ) : (
+                    ) : (
-                <i
+                      <i
-                  className="bx bx-dots-vertical-rounded bx-sm text-muted"
+                        className="bx bx-dots-vertical-rounded bx-sm text-muted"
-                  data-bs-toggle="tooltip"
+                        data-bs-toggle="tooltip"
-                  data-bs-offset="0,8"
+                        data-bs-offset="0,8"
-                  data-bs-placement="top"
+                        data-bs-placement="top"
-                  data-bs-custom-class="tooltip-dark"
+                        data-bs-custom-class="tooltip-dark"
-                  title="More Action"
+                        title="More Action"
-                ></i>
+                      ></i>
-              )}
+                    )}
                   </button>
                   <ul className="dropdown-menu dropdown-menu-end">
                     <li>
@@ -157,11 +161,7 @@ const ProjectCard = ({ projectData, recall }) => {
                       </a>
                     </li>
                     <li
-                      onClick={() =>
+                      onClick={handleViewActivities}
-                        navigate(
-                          `/activities/records?project=${projectInfo.id}`
-                        )
-                      }
                     >
                       <a className="dropdown-item">
                         <i className="bx bx-task me-2"></i>

src/pages/project/ProjectListView.jsx

@@ -69,6 +69,11 @@ const ProjectListView = ({ projectData, recall }) => {
     navigate(`/projects/details`);
   };
 
+  const handleViewActivities = () => {
+    dispatch(setProjectId(projectInfo.id))
+    navigate(`/activities/records?project=${projectInfo.id}`);
+  };
+
   const handleFormSubmit = (updatedProject) => {
     if (projectInfo?.id) {
       updateProject({
@@ -183,9 +188,7 @@ const ProjectListView = ({ projectData, recall }) => {
                 </a>
               </li>
               <li
-                onClick={() =>
+                onClick={handleViewActivities}
-                  navigate(`/activities/records?project=${projectInfo.id}`)
-                }
               >
                 <a className="dropdown-item">
                   <i className="bx bx-task me-2"></i>