From 83234134318083dc18715529da2167cc43c56702 Mon Sep 17 00:00:00 2001 From: Piyush Gupta Date: Wed, 26 Nov 2025 13:31:08 +0530 Subject: [PATCH 1/2] fix: project navigation --- .../components/ProjectSelect/ProjectSelect.tsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx index 45325d22d5..64e0b66661 100644 --- a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx +++ b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx @@ -8,7 +8,7 @@ import { faStar as faSolidStar } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { Link, linkOptions } from "@tanstack/react-router"; +import { Link, linkOptions, useParams } from "@tanstack/react-router"; import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal"; import { OrgPermissionCan } from "@app/components/permissions"; @@ -46,7 +46,7 @@ const PROJECT_TYPE_NAME: Record = { [ProjectType.SecretScanning]: "Secret Scanning" }; -export const ProjectSelect = () => { +const ProjectSelectInner = () => { const [searchProject, setSearchProject] = useState(""); const { currentProject: currentWorkspace } = useProject(); const { currentOrg } = useOrganization(); @@ -238,3 +238,13 @@ export const ProjectSelect = () => { ); }; + +export const ProjectSelect = () => { + const params = useParams({ strict: false }); + + if (!params.projectId) { + return null; + } + + return ; +}; From 59cfc27792fbed75df97ee85b09b4b8f2b3f21a2 Mon Sep 17 00:00:00 2001 From: Piyush Gupta Date: Wed, 26 Nov 2025 22:10:11 +0530 Subject: [PATCH 2/2] chore: adds comment --- .../ProjectLayout/components/ProjectSelect/ProjectSelect.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx index 64e0b66661..e701863eba 100644 --- a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx +++ b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx @@ -242,6 +242,7 @@ const ProjectSelectInner = () => { export const ProjectSelect = () => { const params = useParams({ strict: false }); + // Return null during navigation when projectId is not available if (!params.projectId) { return null; }