Compare commits

..

No commits in common. "23486cbec612cf5618bfab610cbee1b03bdb0b44" and "5995c74ae6191a2b7465f39fbd36a229bfeddd83" have entirely different histories.

3 changed files with 10 additions and 26 deletions

View File

@ -29,7 +29,7 @@ const InfraPlanning = () =>
useEffect( () => useEffect( () =>
{ {
dispatch(setProjectId(projects[0]?.id)) dispatch(setProjectId(projects[0]?.id))
},[projects]) })
return ( return (
<div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4"> <div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4">
@ -49,7 +49,7 @@ const InfraPlanning = () =>
{!project_listLoader && projects?.filter(project => {!project_listLoader && projects?.filter(project =>
LoggedUser?.projects?.map(Number).includes(project.id)).map((project)=>( LoggedUser?.projects?.map(Number).includes(project.id)).map((project)=>(
<option key={project.id} value={project.id}>{project.name}</option> <option value={project.id}>{project.name}</option>
))} ))}
</select> </select>
</div> </div>

View File

@ -4,7 +4,6 @@ import {
getCachedData, getCachedData,
} from "../slices/apiDataManager" } from "../slices/apiDataManager"
import ProjectRepository from "../repositories/ProjectRepository"; import ProjectRepository from "../repositories/ProjectRepository";
import { useProfile } from "./useProfile";
@ -85,7 +84,7 @@ export const useEmployeesByProjectAllocated = ( selectedProject ) =>
} }
export const useProjectDetails =(projectId)=>{ export const useProjectDetails =(projectId)=>{
const {profile} = useProfile();
const [projects_Details, setProject_Details] = useState(null); const [projects_Details, setProject_Details] = useState(null);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState(""); const [error, setError] = useState("");
@ -114,11 +113,11 @@ export const useProjectDetails =(projectId)=>{
}; };
useEffect(()=>{ useEffect(()=>{
if ( profile && (projectId != undefined) ) if ( projectId )
{ {
fetchData() fetchData()
} }
},[projectId,profile]) },[projectId])
return { projects_Details,loading,error,refetch:fetchData} return { projects_Details,loading,error,refetch:fetchData}

View File

@ -6,19 +6,10 @@ import ProjectRepository from "../../repositories/ProjectRepository";
import Breadcrumb from "../../components/common/Breadcrumb"; import Breadcrumb from "../../components/common/Breadcrumb";
import InfraPlanning from "../../components/Activities/InfraPlanning"; import InfraPlanning from "../../components/Activities/InfraPlanning";
import { cacheData, getCachedData } from "../../slices/apiDataManager"; import { cacheData, getCachedData } from "../../slices/apiDataManager";
import { useProfile } from "../../hooks/useProfile";
import { useDispatch, useSelector } from "react-redux";
import { useProjectDetails, useProjects } from "../../hooks/useProjects";
import { setProjectId } from "../../slices/localVariablesSlice";
var projectId; var projectId;
const TaskPlannng = () => { const TaskPlannng = () => {
const {profile} = useProfile();
const {projects,loading:project_listLoader,error:projects_error} = useProjects();
const dispatch = useDispatch();
const selectedProject = useSelector((store)=>store.localVariables.projectId);
const [project, setProject] = useState(null); const [project, setProject] = useState(null);
const [projectDetails, setProjectDetails] = useState(null); const [projectDetails, setProjectDetails] = useState(null);
@ -26,10 +17,6 @@ const TaskPlannng = () => {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState(""); const [error, setError] = useState("");
useEffect( () =>
{
dispatch(setProjectId(projects[0]?.id))
},[projects])
const fetchActivities = async () => { const fetchActivities = async () => {
try { try {
@ -56,9 +43,9 @@ const TaskPlannng = () => {
const fetchData = async () => { const fetchData = async () => {
try { try {
const project_cache = getCachedData(`projectinfo-${selectedProject}`); const project_cache = getCachedData(`projectinfo-${1}`);
if (!project_cache) { if (!project_cache) {
ProjectRepository.getProjectByprojectId(selectedProject) ProjectRepository.getProjectByprojectId(1)
.then((response) => { .then((response) => {
setProjectDetails(response); setProjectDetails(response);
setProject(response); setProject(response);
@ -86,16 +73,14 @@ const TaskPlannng = () => {
}; };
const handleDataChange = (data) => { const handleDataChange = (data) => {
console.log("datachange")
fetchData(); fetchData();
}; };
useEffect(() => { useEffect(() => {
if((projects.length != 0)){ projectId =1
fetchData(); fetchData();
fetchActivities(); fetchActivities();
} }, []);
}, [selectedProject]);
return ( return (