Skip to content

Commit 6f01f7f

Browse files
SkyeYoungSkyeYoung
authored
refactor(consumers): use Outlet to render child routes (#3133)
1 parent f8e2ffa commit 6f01f7f

File tree

7 files changed

+122
-64
lines changed

7 files changed

+122
-64
lines changed

‎src/components/page-slice/consumers/DetailCredentialsTabs.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ export const DetailCredentialsTabs = () => {
3636
},
3737
{
3838
value: 'credentials',
39-
label: t('info.detail.title', {
40-
name: t('credentials.singular'),
41-
}),
39+
label: t('sources.credentials'),
4240
},
4341
],
4442
[t]

‎src/routeTree.gen.ts‎

Lines changed: 85 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import { Route as RoutesDetailIdImport } from './routes/routes/detail.$id'
4343
import { Route as ProtosDetailIdImport } from './routes/protos/detail.$id'
4444
import { Route as PluginconfigsDetailIdImport } from './routes/plugin_configs/detail.$id'
4545
import { Route as GlobalrulesDetailIdImport } from './routes/global_rules/detail.$id'
46+
import { Route as ConsumersDetailUsernameImport } from './routes/consumers/detail.$username'
4647
import { Route as ConsumergroupsDetailIdImport } from './routes/consumer_groups/detail.$id'
4748
import { Route as ServicesDetailIdIndexImport } from './routes/services/detail.$id/index'
4849
import { Route as ConsumersDetailUsernameIndexImport } from './routes/consumers/detail.$username/index'
@@ -251,6 +252,12 @@ const GlobalrulesDetailIdRoute = GlobalrulesDetailIdImport.update({
251252
getParentRoute: () => rootRoute,
252253
} as any)
253254

255+
const ConsumersDetailUsernameRoute = ConsumersDetailUsernameImport.update({
256+
id: '/consumers/detail/$username',
257+
path: '/consumers/detail/$username',
258+
getParentRoute: () => rootRoute,
259+
} as any)
260+
254261
const ConsumergroupsDetailIdRoute = ConsumergroupsDetailIdImport.update({
255262
id: '/consumer_groups/detail/$id',
256263
path: '/consumer_groups/detail/$id',
@@ -265,9 +272,9 @@ const ServicesDetailIdIndexRoute = ServicesDetailIdIndexImport.update({
265272

266273
const ConsumersDetailUsernameIndexRoute =
267274
ConsumersDetailUsernameIndexImport.update({
268-
id: '/consumers/detail/$username/',
269-
path: '/consumers/detail/$username/',
270-
getParentRoute: () => rootRoute,
275+
id: '/',
276+
path: '/',
277+
getParentRoute: () => ConsumersDetailUsernameRoute,
271278
} as any)
272279

273280
const SecretsDetailManagerIdRoute = SecretsDetailManagerIdImport.update({
@@ -292,9 +299,9 @@ const ServicesDetailIdRoutesIndexRoute =
292299

293300
const ConsumersDetailUsernameCredentialsIndexRoute =
294301
ConsumersDetailUsernameCredentialsIndexImport.update({
295-
id: '/consumers/detail/$username/credentials/',
296-
path: '/consumers/detail/$username/credentials/',
297-
getParentRoute: () => rootRoute,
302+
id: '/credentials/',
303+
path: '/credentials/',
304+
getParentRoute: () => ConsumersDetailUsernameRoute,
298305
} as any)
299306

300307
const ServicesDetailIdStreamroutesAddRoute =
@@ -312,9 +319,9 @@ const ServicesDetailIdRoutesAddRoute = ServicesDetailIdRoutesAddImport.update({
312319

313320
const ConsumersDetailUsernameCredentialsAddRoute =
314321
ConsumersDetailUsernameCredentialsAddImport.update({
315-
id: '/consumers/detail/$username/credentials/add',
316-
path: '/consumers/detail/$username/credentials/add',
317-
getParentRoute: () => rootRoute,
322+
id: '/credentials/add',
323+
path: '/credentials/add',
324+
getParentRoute: () => ConsumersDetailUsernameRoute,
318325
} as any)
319326

320327
const ServicesDetailIdStreamroutesDetailRouteIdRoute =
@@ -333,9 +340,9 @@ const ServicesDetailIdRoutesDetailRouteIdRoute =
333340

334341
const ConsumersDetailUsernameCredentialsDetailIdRoute =
335342
ConsumersDetailUsernameCredentialsDetailIdImport.update({
336-
id: '/consumers/detail/$username/credentials/detail/$id',
337-
path: '/consumers/detail/$username/credentials/detail/$id',
338-
getParentRoute: () => rootRoute,
343+
id: '/credentials/detail/$id',
344+
path: '/credentials/detail/$id',
345+
getParentRoute: () => ConsumersDetailUsernameRoute,
339346
} as any)
340347

341348
// Populate the FileRoutesByPath interface
@@ -517,6 +524,13 @@ declare module '@tanstack/react-router' {
517524
preLoaderRoute: typeof ConsumergroupsDetailIdImport
518525
parentRoute: typeof rootRoute
519526
}
527+
'/consumers/detail/$username': {
528+
id: '/consumers/detail/$username'
529+
path: '/consumers/detail/$username'
530+
fullPath: '/consumers/detail/$username'
531+
preLoaderRoute: typeof ConsumersDetailUsernameImport
532+
parentRoute: typeof rootRoute
533+
}
520534
'/global_rules/detail/$id': {
521535
id: '/global_rules/detail/$id'
522536
path: '/global_rules/detail/$id'
@@ -582,10 +596,10 @@ declare module '@tanstack/react-router' {
582596
}
583597
'/consumers/detail/$username/': {
584598
id: '/consumers/detail/$username/'
585-
path: '/consumers/detail/$username'
586-
fullPath: '/consumers/detail/$username'
599+
path: '/'
600+
fullPath: '/consumers/detail/$username/'
587601
preLoaderRoute: typeof ConsumersDetailUsernameIndexImport
588-
parentRoute: typeof rootRoute
602+
parentRoute: typeof ConsumersDetailUsernameImport
589603
}
590604
'/services/detail/$id/': {
591605
id: '/services/detail/$id/'
@@ -596,10 +610,10 @@ declare module '@tanstack/react-router' {
596610
}
597611
'/consumers/detail/$username/credentials/add': {
598612
id: '/consumers/detail/$username/credentials/add'
599-
path: '/consumers/detail/$username/credentials/add'
613+
path: '/credentials/add'
600614
fullPath: '/consumers/detail/$username/credentials/add'
601615
preLoaderRoute: typeof ConsumersDetailUsernameCredentialsAddImport
602-
parentRoute: typeof rootRoute
616+
parentRoute: typeof ConsumersDetailUsernameImport
603617
}
604618
'/services/detail/$id/routes/add': {
605619
id: '/services/detail/$id/routes/add'
@@ -617,10 +631,10 @@ declare module '@tanstack/react-router' {
617631
}
618632
'/consumers/detail/$username/credentials/': {
619633
id: '/consumers/detail/$username/credentials/'
620-
path: '/consumers/detail/$username/credentials'
634+
path: '/credentials'
621635
fullPath: '/consumers/detail/$username/credentials'
622636
preLoaderRoute: typeof ConsumersDetailUsernameCredentialsIndexImport
623-
parentRoute: typeof rootRoute
637+
parentRoute: typeof ConsumersDetailUsernameImport
624638
}
625639
'/services/detail/$id/routes/': {
626640
id: '/services/detail/$id/routes/'
@@ -638,10 +652,10 @@ declare module '@tanstack/react-router' {
638652
}
639653
'/consumers/detail/$username/credentials/detail/$id': {
640654
id: '/consumers/detail/$username/credentials/detail/$id'
641-
path: '/consumers/detail/$username/credentials/detail/$id'
655+
path: '/credentials/detail/$id'
642656
fullPath: '/consumers/detail/$username/credentials/detail/$id'
643657
preLoaderRoute: typeof ConsumersDetailUsernameCredentialsDetailIdImport
644-
parentRoute: typeof rootRoute
658+
parentRoute: typeof ConsumersDetailUsernameImport
645659
}
646660
'/services/detail/$id/routes/detail/$routeId': {
647661
id: '/services/detail/$id/routes/detail/$routeId'
@@ -662,6 +676,29 @@ declare module '@tanstack/react-router' {
662676

663677
// Create and export the route tree
664678

679+
interface ConsumersDetailUsernameRouteChildren {
680+
ConsumersDetailUsernameIndexRoute: typeof ConsumersDetailUsernameIndexRoute
681+
ConsumersDetailUsernameCredentialsAddRoute: typeof ConsumersDetailUsernameCredentialsAddRoute
682+
ConsumersDetailUsernameCredentialsIndexRoute: typeof ConsumersDetailUsernameCredentialsIndexRoute
683+
ConsumersDetailUsernameCredentialsDetailIdRoute: typeof ConsumersDetailUsernameCredentialsDetailIdRoute
684+
}
685+
686+
const ConsumersDetailUsernameRouteChildren: ConsumersDetailUsernameRouteChildren =
687+
{
688+
ConsumersDetailUsernameIndexRoute: ConsumersDetailUsernameIndexRoute,
689+
ConsumersDetailUsernameCredentialsAddRoute:
690+
ConsumersDetailUsernameCredentialsAddRoute,
691+
ConsumersDetailUsernameCredentialsIndexRoute:
692+
ConsumersDetailUsernameCredentialsIndexRoute,
693+
ConsumersDetailUsernameCredentialsDetailIdRoute:
694+
ConsumersDetailUsernameCredentialsDetailIdRoute,
695+
}
696+
697+
const ConsumersDetailUsernameRouteWithChildren =
698+
ConsumersDetailUsernameRoute._addFileChildren(
699+
ConsumersDetailUsernameRouteChildren,
700+
)
701+
665702
interface ServicesDetailIdRouteChildren {
666703
ServicesDetailIdIndexRoute: typeof ServicesDetailIdIndexRoute
667704
ServicesDetailIdRoutesAddRoute: typeof ServicesDetailIdRoutesAddRoute
@@ -714,6 +751,7 @@ export interface FileRoutesByFullPath {
714751
'/stream_routes': typeof StreamroutesIndexRoute
715752
'/upstreams': typeof UpstreamsIndexRoute
716753
'/consumer_groups/detail/$id': typeof ConsumergroupsDetailIdRoute
754+
'/consumers/detail/$username': typeof ConsumersDetailUsernameRouteWithChildren
717755
'/global_rules/detail/$id': typeof GlobalrulesDetailIdRoute
718756
'/plugin_configs/detail/$id': typeof PluginconfigsDetailIdRoute
719757
'/protos/detail/$id': typeof ProtosDetailIdRoute
@@ -723,7 +761,7 @@ export interface FileRoutesByFullPath {
723761
'/stream_routes/detail/$id': typeof StreamroutesDetailIdRoute
724762
'/upstreams/detail/$id': typeof UpstreamsDetailIdRoute
725763
'/secrets/detail/$manager/$id': typeof SecretsDetailManagerIdRoute
726-
'/consumers/detail/$username': typeof ConsumersDetailUsernameIndexRoute
764+
'/consumers/detail/$username/': typeof ConsumersDetailUsernameIndexRoute
727765
'/services/detail/$id/': typeof ServicesDetailIdIndexRoute
728766
'/consumers/detail/$username/credentials/add': typeof ConsumersDetailUsernameCredentialsAddRoute
729767
'/services/detail/$id/routes/add': typeof ServicesDetailIdRoutesAddRoute
@@ -810,6 +848,7 @@ export interface FileRoutesById {
810848
'/stream_routes/': typeof StreamroutesIndexRoute
811849
'/upstreams/': typeof UpstreamsIndexRoute
812850
'/consumer_groups/detail/$id': typeof ConsumergroupsDetailIdRoute
851+
'/consumers/detail/$username': typeof ConsumersDetailUsernameRouteWithChildren
813852
'/global_rules/detail/$id': typeof GlobalrulesDetailIdRoute
814853
'/plugin_configs/detail/$id': typeof PluginconfigsDetailIdRoute
815854
'/protos/detail/$id': typeof ProtosDetailIdRoute
@@ -860,6 +899,7 @@ export interface FileRouteTypes {
860899
| '/stream_routes'
861900
| '/upstreams'
862901
| '/consumer_groups/detail/$id'
902+
| '/consumers/detail/$username'
863903
| '/global_rules/detail/$id'
864904
| '/plugin_configs/detail/$id'
865905
| '/protos/detail/$id'
@@ -869,7 +909,7 @@ export interface FileRouteTypes {
869909
| '/stream_routes/detail/$id'
870910
| '/upstreams/detail/$id'
871911
| '/secrets/detail/$manager/$id'
872-
| '/consumers/detail/$username'
912+
| '/consumers/detail/$username/'
873913
| '/services/detail/$id/'
874914
| '/consumers/detail/$username/credentials/add'
875915
| '/services/detail/$id/routes/add'
@@ -953,6 +993,7 @@ export interface FileRouteTypes {
953993
| '/stream_routes/'
954994
| '/upstreams/'
955995
| '/consumer_groups/detail/$id'
996+
| '/consumers/detail/$username'
956997
| '/global_rules/detail/$id'
957998
| '/plugin_configs/detail/$id'
958999
| '/protos/detail/$id'
@@ -1002,6 +1043,7 @@ export interface RootRouteChildren {
10021043
StreamroutesIndexRoute: typeof StreamroutesIndexRoute
10031044
UpstreamsIndexRoute: typeof UpstreamsIndexRoute
10041045
ConsumergroupsDetailIdRoute: typeof ConsumergroupsDetailIdRoute
1046+
ConsumersDetailUsernameRoute: typeof ConsumersDetailUsernameRouteWithChildren
10051047
GlobalrulesDetailIdRoute: typeof GlobalrulesDetailIdRoute
10061048
PluginconfigsDetailIdRoute: typeof PluginconfigsDetailIdRoute
10071049
ProtosDetailIdRoute: typeof ProtosDetailIdRoute
@@ -1011,10 +1053,6 @@ export interface RootRouteChildren {
10111053
StreamroutesDetailIdRoute: typeof StreamroutesDetailIdRoute
10121054
UpstreamsDetailIdRoute: typeof UpstreamsDetailIdRoute
10131055
SecretsDetailManagerIdRoute: typeof SecretsDetailManagerIdRoute
1014-
ConsumersDetailUsernameIndexRoute: typeof ConsumersDetailUsernameIndexRoute
1015-
ConsumersDetailUsernameCredentialsAddRoute: typeof ConsumersDetailUsernameCredentialsAddRoute
1016-
ConsumersDetailUsernameCredentialsIndexRoute: typeof ConsumersDetailUsernameCredentialsIndexRoute
1017-
ConsumersDetailUsernameCredentialsDetailIdRoute: typeof ConsumersDetailUsernameCredentialsDetailIdRoute
10181056
}
10191057

10201058
const rootRouteChildren: RootRouteChildren = {
@@ -1043,6 +1081,7 @@ const rootRouteChildren: RootRouteChildren = {
10431081
StreamroutesIndexRoute: StreamroutesIndexRoute,
10441082
UpstreamsIndexRoute: UpstreamsIndexRoute,
10451083
ConsumergroupsDetailIdRoute: ConsumergroupsDetailIdRoute,
1084+
ConsumersDetailUsernameRoute: ConsumersDetailUsernameRouteWithChildren,
10461085
GlobalrulesDetailIdRoute: GlobalrulesDetailIdRoute,
10471086
PluginconfigsDetailIdRoute: PluginconfigsDetailIdRoute,
10481087
ProtosDetailIdRoute: ProtosDetailIdRoute,
@@ -1052,13 +1091,6 @@ const rootRouteChildren: RootRouteChildren = {
10521091
StreamroutesDetailIdRoute: StreamroutesDetailIdRoute,
10531092
UpstreamsDetailIdRoute: UpstreamsDetailIdRoute,
10541093
SecretsDetailManagerIdRoute: SecretsDetailManagerIdRoute,
1055-
ConsumersDetailUsernameIndexRoute: ConsumersDetailUsernameIndexRoute,
1056-
ConsumersDetailUsernameCredentialsAddRoute:
1057-
ConsumersDetailUsernameCredentialsAddRoute,
1058-
ConsumersDetailUsernameCredentialsIndexRoute:
1059-
ConsumersDetailUsernameCredentialsIndexRoute,
1060-
ConsumersDetailUsernameCredentialsDetailIdRoute:
1061-
ConsumersDetailUsernameCredentialsDetailIdRoute,
10621094
}
10631095

10641096
export const routeTree = rootRoute
@@ -1096,6 +1128,7 @@ export const routeTree = rootRoute
10961128
"/stream_routes/",
10971129
"/upstreams/",
10981130
"/consumer_groups/detail/$id",
1131+
"/consumers/detail/$username",
10991132
"/global_rules/detail/$id",
11001133
"/plugin_configs/detail/$id",
11011134
"/protos/detail/$id",
@@ -1104,11 +1137,7 @@ export const routeTree = rootRoute
11041137
"/ssls/detail/$id",
11051138
"/stream_routes/detail/$id",
11061139
"/upstreams/detail/$id",
1107-
"/secrets/detail/$manager/$id",
1108-
"/consumers/detail/$username/",
1109-
"/consumers/detail/$username/credentials/add",
1110-
"/consumers/detail/$username/credentials/",
1111-
"/consumers/detail/$username/credentials/detail/$id"
1140+
"/secrets/detail/$manager/$id"
11121141
]
11131142
},
11141143
"/": {
@@ -1186,6 +1215,15 @@ export const routeTree = rootRoute
11861215
"/consumer_groups/detail/$id": {
11871216
"filePath": "consumer_groups/detail.$id.tsx"
11881217
},
1218+
"/consumers/detail/$username": {
1219+
"filePath": "consumers/detail.$username.tsx",
1220+
"children": [
1221+
"/consumers/detail/$username/",
1222+
"/consumers/detail/$username/credentials/add",
1223+
"/consumers/detail/$username/credentials/",
1224+
"/consumers/detail/$username/credentials/detail/$id"
1225+
]
1226+
},
11891227
"/global_rules/detail/$id": {
11901228
"filePath": "global_rules/detail.$id.tsx"
11911229
},
@@ -1223,14 +1261,16 @@ export const routeTree = rootRoute
12231261
"filePath": "secrets/detail.$manager.$id.tsx"
12241262
},
12251263
"/consumers/detail/$username/": {
1226-
"filePath": "consumers/detail.$username/index.tsx"
1264+
"filePath": "consumers/detail.$username/index.tsx",
1265+
"parent": "/consumers/detail/$username"
12271266
},
12281267
"/services/detail/$id/": {
12291268
"filePath": "services/detail.$id/index.tsx",
12301269
"parent": "/services/detail/$id"
12311270
},
12321271
"/consumers/detail/$username/credentials/add": {
1233-
"filePath": "consumers/detail.$username/credentials/add.tsx"
1272+
"filePath": "consumers/detail.$username/credentials/add.tsx",
1273+
"parent": "/consumers/detail/$username"
12341274
},
12351275
"/services/detail/$id/routes/add": {
12361276
"filePath": "services/detail.$id/routes/add.tsx",
@@ -1241,7 +1281,8 @@ export const routeTree = rootRoute
12411281
"parent": "/services/detail/$id"
12421282
},
12431283
"/consumers/detail/$username/credentials/": {
1244-
"filePath": "consumers/detail.$username/credentials/index.tsx"
1284+
"filePath": "consumers/detail.$username/credentials/index.tsx",
1285+
"parent": "/consumers/detail/$username"
12451286
},
12461287
"/services/detail/$id/routes/": {
12471288
"filePath": "services/detail.$id/routes/index.tsx",
@@ -1252,7 +1293,8 @@ export const routeTree = rootRoute
12521293
"parent": "/services/detail/$id"
12531294
},
12541295
"/consumers/detail/$username/credentials/detail/$id": {
1255-
"filePath": "consumers/detail.$username/credentials/detail.$id.tsx"
1296+
"filePath": "consumers/detail.$username/credentials/detail.$id.tsx",
1297+
"parent": "/consumers/detail/$username"
12561298
},
12571299
"/services/detail/$id/routes/detail/$routeId": {
12581300
"filePath": "services/detail.$id/routes/detail.$routeId.tsx",

‎src/routes/consumers/detail.$username.tsx‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
import { createFileRoute, Outlet } from '@tanstack/react-router';
18+
19+
import { DetailCredentialsTabs } from '@/components/page-slice/consumers/DetailCredentialsTabs';
20+
21+
function RouteComponent() {
22+
return (
23+
<>
24+
<DetailCredentialsTabs />
25+
<Outlet />
26+
</>
27+
);
28+
}
29+
30+
export const Route = createFileRoute('/consumers/detail/$username')({
31+
component: RouteComponent,
32+
});

0 commit comments

Comments
 (0)