Activities redirection issue – Redirects to “Marco Secure Solution Pvt Ltd” project by default
This commit is contained in:
parent
4e315aafcf
commit
1286184e1f
@ -14,13 +14,13 @@ import {
|
|||||||
getProjectStatusName,
|
getProjectStatusName,
|
||||||
} from "../../utils/projectStatus";
|
} from "../../utils/projectStatus";
|
||||||
import GlobalModel from "../common/GlobalModel";
|
import GlobalModel from "../common/GlobalModel";
|
||||||
import { useDispatch } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import { setProjectId } from "../../slices/localVariablesSlice";
|
import { setProjectId } from "../../slices/localVariablesSlice";
|
||||||
|
|
||||||
const ProjectCard = ({ projectData, recall }) => {
|
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 [showModal, setShowModal] = useState(false);
|
||||||
const dispatch = useDispatch()
|
const dispatch = useDispatch()
|
||||||
@ -37,9 +37,9 @@ const ProjectCard = ({ projectData, recall }) => {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
useEffect(()=>{
|
useEffect(() => {
|
||||||
setProjectInfo(projectData);
|
setProjectInfo(projectData);
|
||||||
}, [ projectData ] )
|
}, [projectData])
|
||||||
|
|
||||||
const handleShow = async () => {
|
const handleShow = async () => {
|
||||||
try {
|
try {
|
||||||
@ -63,6 +63,10 @@ const ProjectCard = ({ projectData, recall }) => {
|
|||||||
dispatch(setProjectId(projectInfo.id))
|
dispatch(setProjectId(projectInfo.id))
|
||||||
navigate(`/projects/details`);
|
navigate(`/projects/details`);
|
||||||
};
|
};
|
||||||
|
const handleViewActivities = () => {
|
||||||
|
dispatch(setProjectId(projectInfo.id))
|
||||||
|
navigate(`/activities/records?project=${projectInfo.id}`);
|
||||||
|
};
|
||||||
|
|
||||||
const handleFormSubmit = (updatedProject) => {
|
const handleFormSubmit = (updatedProject) => {
|
||||||
if (projectInfo?.id) {
|
if (projectInfo?.id) {
|
||||||
@ -71,7 +75,7 @@ const ProjectCard = ({ projectData, recall }) => {
|
|||||||
updatedData: updatedProject,
|
updatedData: updatedProject,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@ -157,11 +161,7 @@ const ProjectCard = ({ projectData, recall }) => {
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
onClick={() =>
|
onClick={handleViewActivities}
|
||||||
navigate(
|
|
||||||
`/activities/records?project=${projectInfo.id}`
|
|
||||||
)
|
|
||||||
}
|
|
||||||
>
|
>
|
||||||
<a className="dropdown-item">
|
<a className="dropdown-item">
|
||||||
<i className="bx bx-task me-2"></i>
|
<i className="bx bx-task me-2"></i>
|
||||||
|
@ -69,6 +69,11 @@ const ProjectListView = ({ projectData, recall }) => {
|
|||||||
navigate(`/projects/details`);
|
navigate(`/projects/details`);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleViewActivities = () => {
|
||||||
|
dispatch(setProjectId(projectInfo.id))
|
||||||
|
navigate(`/activities/records?project=${projectInfo.id}`);
|
||||||
|
};
|
||||||
|
|
||||||
const handleFormSubmit = (updatedProject) => {
|
const handleFormSubmit = (updatedProject) => {
|
||||||
if (projectInfo?.id) {
|
if (projectInfo?.id) {
|
||||||
updateProject({
|
updateProject({
|
||||||
@ -183,9 +188,7 @@ const ProjectListView = ({ projectData, recall }) => {
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li
|
<li
|
||||||
onClick={() =>
|
onClick={handleViewActivities}
|
||||||
navigate(`/activities/records?project=${projectInfo.id}`)
|
|
||||||
}
|
|
||||||
>
|
>
|
||||||
<a className="dropdown-item">
|
<a className="dropdown-item">
|
||||||
<i className="bx bx-task me-2"></i>
|
<i className="bx bx-task me-2"></i>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user