File tree 1 file changed +10
-4
lines changed
1 file changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -56,11 +56,17 @@ export default function Menu() {
56
56
getGitpodService ( ) . server . getBillingModeForUser ( ) . then ( setUserBillingMode ) ;
57
57
} , [ ] ) ;
58
58
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?" ,
61
61
) ;
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
+
62
68
const projectSlug = ( ( ) => {
63
- const resource = match ?. params ?. segment2 ;
69
+ const resource = teamRouteMatch ?. params ?. segment2 || projectsRouteMatch ?. params . segment1 ;
64
70
if (
65
71
resource &&
66
72
! [
@@ -80,7 +86,7 @@ export default function Menu() {
80
86
}
81
87
} ) ( ) ;
82
88
const prebuildId = ( ( ) => {
83
- const resource = projectSlug && match ?. params ?. segment3 ;
89
+ const resource = projectSlug && ( teamRouteMatch ?. params ?. segment3 || projectsRouteMatch ?. params . segment2 ) ;
84
90
if (
85
91
resource &&
86
92
! [
You can’t perform that action at this time.
0 commit comments