normalize projectId from localStorage to avoid "null" string
This commit is contained in:
parent
ace507232a
commit
63a5f7b902
@ -79,11 +79,11 @@ const EmployeeList = () => {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (selectedProjectId === null) {
|
if (!selectedProjectId && projectNames?.length > 0) {
|
||||||
dispatch(setProjectId(projectNames[0]?.id));
|
dispatch(setProjectId(projectNames[0].id));
|
||||||
}
|
}
|
||||||
}, [selectedProjectId]);
|
}, [selectedProjectId, projectNames, dispatch]);
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const applySearchFilter = (data, text) => {
|
const applySearchFilter = (data, text) => {
|
||||||
|
@ -39,10 +39,17 @@ export const useSelectedProject = () => {
|
|||||||
const selectedProject = useSelector(
|
const selectedProject = useSelector(
|
||||||
(store) => store.localVariables.projectId
|
(store) => store.localVariables.projectId
|
||||||
);
|
);
|
||||||
var project = localStorage.getItem("project");
|
|
||||||
|
const project = localStorage.getItem("project");
|
||||||
|
|
||||||
if (project) {
|
if (project) {
|
||||||
return project;
|
try {
|
||||||
} else {
|
const parsed = JSON.parse(project);
|
||||||
return selectedProject;
|
return parsed ?? selectedProject;
|
||||||
|
} catch (e) {
|
||||||
|
return selectedProject;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
return selectedProject;
|
||||||
|
}
|
@ -23,7 +23,7 @@ const localVariablesSlice = createSlice({
|
|||||||
setProjectId: (state, action) => {
|
setProjectId: (state, action) => {
|
||||||
localStorage.setItem("project",null)
|
localStorage.setItem("project",null)
|
||||||
state.projectId = action.payload;
|
state.projectId = action.payload;
|
||||||
localStorage.setItem("project",state.projectId)
|
localStorage.setItem("project",state.projectId || null)
|
||||||
},
|
},
|
||||||
refreshData: ( state, action ) =>
|
refreshData: ( state, action ) =>
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user