Sidemenu project id fix (#872)

* Navigate to current project in Welcome * Use currentProject.id in sidemenu navigation
equinor · Nov 15, 2022 · 3ecba75 · 3ecba75
1 parent a3e1948
commit 3ecba75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/frontend/src/Components/SideMenu/ProjectMenu.tsx b/frontend/src/Components/SideMenu/ProjectMenu.tsx
@@ -59,7 +59,7 @@ function ProjectMenu({ project }: Props) {
     return (
         <ExpandableDiv>
             <nav>
-                <LinkWithoutStyle to={ProjectPath(fusionContextId!)}>
+                <LinkWithoutStyle to={ProjectPath(currentProject?.externalId!)}>
                     <MenuItem
                         title={project.name!}
                         isSelected={currentProject?.externalId === project.id}
@@ -75,7 +75,7 @@ function ProjectMenu({ project }: Props) {
                         <Item key={`project-menu-item-${index + 1}`}>
                             {projectMenuItem.name === ProjectMenuItemType.OVERVIEW && (
                                 <nav>
-                                    <LinkWithoutStyle to={`/${fusionContextId}`}>
+                                    <LinkWithoutStyle to={`/${currentProject?.id}`}>
                                         <ProjectMenuItemComponent
                                             item={projectMenuItem}
                                             projectId={project.id}

diff --git a/frontend/src/Components/SideMenu/ProjectMenuItemComponent.tsx b/frontend/src/Components/SideMenu/ProjectMenuItemComponent.tsx
@@ -73,7 +73,11 @@ function ProjectMenuItemComponent({ item, projectId, subItems }: Props) {
                     {subItems.map((subItem, index) => (
                         <SubItem key={`menu-sub-item-${index + 1}`}>
                             <nav>
-                                <LinkWithoutStyle to={CasePath(fusionContextId!, subItem.id ? subItem.id : "")}>
+                                <LinkWithoutStyle to={CasePath(
+                                    currentProject?.id!,
+                                    subItem.id ? subItem.id : "",
+                                )}
+                                >
                                     <MenuItem
                                         title={subItem.name ? subItem.name : "Untitled"}
                                         isSelected={isSelected && caseId === subItem.id}