Skip to content

Commit 98bec46

Browse files
mustard-mhroboquat
authored andcommitted
[dashboard] make sure all team route under /t
1 parent 881abd7 commit 98bec46

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

components/dashboard/src/Menu.tsx

+10-4
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,17 @@ export default function Menu() {
5656
getGitpodService().server.getBillingModeForUser().then(setUserBillingMode);
5757
}, []);
5858

59-
const match = useRouteMatch<{ segment1?: string; segment2?: string; segment3?: string }>(
60-
"/(t/)?:segment1/:segment2?/:segment3?",
59+
const teamRouteMatch = useRouteMatch<{ segment1?: string; segment2?: string; segment3?: string }>(
60+
"/t/:segment1/:segment2?/:segment3?",
6161
);
62+
63+
// TODO: Remove it after remove projects under personal accounts
64+
const projectsRouteMatch = useRouteMatch<{ segment1?: string; segment2?: string }>(
65+
"/projects/:segment1?/:segment2?",
66+
);
67+
6268
const projectSlug = (() => {
63-
const resource = match?.params?.segment2;
69+
const resource = teamRouteMatch?.params?.segment2 || projectsRouteMatch?.params.segment1;
6470
if (
6571
resource &&
6672
![
@@ -80,7 +86,7 @@ export default function Menu() {
8086
}
8187
})();
8288
const prebuildId = (() => {
83-
const resource = projectSlug && match?.params?.segment3;
89+
const resource = projectSlug && (teamRouteMatch?.params?.segment3 || projectsRouteMatch?.params.segment2);
8490
if (
8591
resource &&
8692
![

0 commit comments

Comments
 (0)