fix: sidebar projectId from nested project object
This commit is contained in:
@@ -55,7 +55,7 @@ const Sidebar = ({ isCollapsed }: { isCollapsed?: boolean }) => {
|
|||||||
if (!user) return;
|
if (!user) return;
|
||||||
employeeService.getActiveDispatches().then((res) => {
|
employeeService.getActiveDispatches().then((res) => {
|
||||||
if (res.success && res.data) {
|
if (res.success && res.data) {
|
||||||
setActiveDispatches(res.data.map((d: any) => ({ projectName: d.projectName || 'Project', projectId: d.projectId })));
|
setActiveDispatches(res.data.map((d: any) => ({ projectName: d.project?.projectName || 'Project', projectId: d.project?.projectId })));
|
||||||
}
|
}
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
}, [user]);
|
}, [user]);
|
||||||
@@ -343,7 +343,7 @@ const Sidebar = ({ isCollapsed }: { isCollapsed?: boolean }) => {
|
|||||||
{projectsList.length > 0 ? projectsList.map((project) => (
|
{projectsList.length > 0 ? projectsList.map((project) => (
|
||||||
<Link
|
<Link
|
||||||
key={project.name}
|
key={project.name}
|
||||||
href={`/dispatch?projectId=${project.projectId}`}
|
href={`/dispatch${project.projectId ? `?projectId=${project.projectId}` : ''}`}
|
||||||
title={isCollapsed ? project.name : ''}
|
title={isCollapsed ? project.name : ''}
|
||||||
className={`flex items-center hover:bg-gray-50 rounded-xl text-xs font-bold text-text-muted transition-colors ${
|
className={`flex items-center hover:bg-gray-50 rounded-xl text-xs font-bold text-text-muted transition-colors ${
|
||||||
isCollapsed ? 'justify-center py-2' : 'px-3 py-2'
|
isCollapsed ? 'justify-center py-2' : 'px-3 py-2'
|
||||||
|
|||||||
Reference in New Issue
Block a user