optimized custom hook usage
This commit is contained in:
parent
d10d47e642
commit
936636c29b
@ -16,7 +16,7 @@ import ConfirmModal from "../common/ConfirmModal";
|
|||||||
|
|
||||||
const Teams = ({ project }) => {
|
const Teams = ({ project }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
dispatch(changeMaster("Job Role"));
|
|
||||||
const { data, loading } = useMaster();
|
const { data, loading } = useMaster();
|
||||||
const [isModalOpen, setIsModelOpen] = useState(false);
|
const [isModalOpen, setIsModelOpen] = useState(false);
|
||||||
const [error, setError] = useState("");
|
const [error, setError] = useState("");
|
||||||
@ -43,11 +43,9 @@ const Teams = ({ project }) => {
|
|||||||
.then((response) => {
|
.then((response) => {
|
||||||
setEmployees(response.data);
|
setEmployees(response.data);
|
||||||
setFilteredEmployees( response.data.filter( ( emp ) => emp.isActive ) );
|
setFilteredEmployees( response.data.filter( ( emp ) => emp.isActive ) );
|
||||||
console.log(response)
|
|
||||||
setEmployeeLoading(false);
|
setEmployeeLoading(false);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error(error);
|
|
||||||
setError("Failed to fetch data.");
|
setError("Failed to fetch data.");
|
||||||
setEmployeeLoading(false);
|
setEmployeeLoading(false);
|
||||||
});
|
});
|
||||||
@ -133,6 +131,11 @@ const Teams = ({ project }) => {
|
|||||||
document.body.style.overflow = "auto";
|
document.body.style.overflow = "auto";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
dispatch(changeMaster("Job Role"));
|
||||||
|
}, [dispatch]);
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
fetchEmployees();
|
fetchEmployees();
|
||||||
}, []);
|
}, []);
|
||||||
|
@ -3,46 +3,40 @@ import AuthRepository from "../repositories/AuthRepository";
|
|||||||
import {cacheProfileData, getCachedProfileData} from "../slices/apiDataManager";
|
import {cacheProfileData, getCachedProfileData} from "../slices/apiDataManager";
|
||||||
import {useSelector} from "react-redux";
|
import {useSelector} from "react-redux";
|
||||||
|
|
||||||
export const useProfile = () =>
|
let hasFetched = false;
|
||||||
{
|
|
||||||
const loggedUser = useSelector((store)=>store.globalVariables.loginUser)
|
export const useProfile = () => {
|
||||||
|
const loggedUser = useSelector( ( store ) => store.globalVariables.loginUser );
|
||||||
const [profile, setProfile] = useState(null);
|
const [profile, setProfile] = useState(null);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [error, setError] = useState("");
|
const [error, setError] = useState("");
|
||||||
|
|
||||||
|
const fetchData = async () => {
|
||||||
const fetchData = async () =>
|
try {
|
||||||
{
|
setLoading(true);
|
||||||
try
|
|
||||||
{
|
|
||||||
setLoading( true )
|
|
||||||
let response = await AuthRepository.profile();
|
let response = await AuthRepository.profile();
|
||||||
setProfile( response.data )
|
setProfile(response.data);
|
||||||
cacheProfileData( response.data )
|
cacheProfileData(response.data);
|
||||||
setLoading( false );
|
} catch (error) {
|
||||||
|
setError("Failed to fetch data.");
|
||||||
} catch ( error )
|
} finally {
|
||||||
{
|
setLoading(false);
|
||||||
setLoading( false )
|
}
|
||||||
console.error( error );
|
};
|
||||||
setError( "Failed to fetch data." );
|
|
||||||
};
|
useEffect(() => {
|
||||||
}
|
if (!hasFetched) {
|
||||||
|
hasFetched = true;
|
||||||
|
if (!loggedUser) {
|
||||||
useEffect( () => {
|
fetchData();
|
||||||
|
} else {
|
||||||
if (!loggedUser )
|
setProfile(loggedUser);
|
||||||
{
|
}
|
||||||
fetchData()
|
|
||||||
} else
|
|
||||||
{
|
|
||||||
setProfile(loggedUser)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
},[])
|
|
||||||
|
|
||||||
return { profile,loading,error}
|
setProfile(loggedUser);
|
||||||
|
|
||||||
}
|
}, [loggedUser]);
|
||||||
|
|
||||||
|
return { profile, loading, error };
|
||||||
|
};
|
||||||
|
@ -2,17 +2,18 @@ import { useEffect, useState } from "react";
|
|||||||
import { cacheData, getCachedData } from "../slices/apiDataManager";
|
import { cacheData, getCachedData } from "../slices/apiDataManager";
|
||||||
import ProjectRepository from "../repositories/ProjectRepository";
|
import ProjectRepository from "../repositories/ProjectRepository";
|
||||||
import { useProfile } from "./useProfile";
|
import { useProfile } from "./useProfile";
|
||||||
import { useDispatch } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import { setProjectId } from "../slices/localVariablesSlice";
|
import { setProjectId } from "../slices/localVariablesSlice";
|
||||||
|
|
||||||
export const useProjects = () => {
|
export const useProjects = () => {
|
||||||
const { profile } = useProfile();
|
|
||||||
|
const loggedUser = useSelector( ( store ) => store.globalVariables.loginUser )
|
||||||
const [projects, setProjects] = useState([]);
|
const [projects, setProjects] = useState([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [error, setError] = useState("");
|
const [error, setError] = useState("");
|
||||||
|
|
||||||
const fetchData = async () => {
|
const fetchData = async () => {
|
||||||
const projectIds = profile?.projects || [];
|
const projectIds = loggedUser?.projects || [];
|
||||||
|
|
||||||
const filterProjects = (projectsList) => {
|
const filterProjects = (projectsList) => {
|
||||||
return projectsList
|
return projectsList
|
||||||
@ -43,12 +44,11 @@ export const useProjects = () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (profile) {
|
if (loggedUser) {
|
||||||
fetchData();
|
fetchData();
|
||||||
}
|
}
|
||||||
}, [profile]);
|
}, [loggedUser]);
|
||||||
|
|
||||||
return { projects, loading, error, refetch: fetchData };
|
return { projects, loading, error, refetch: fetchData };
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user