Skip to content

Commit 6bca84e

Browse files
committed
make silo base route private, make IdPs route canonical
1 parent 31416df commit 6bca84e

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

app/util/__snapshots__/path-builder.spec.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ exports[`breadcrumbs 2`] = `
537537
"path": "/projects/p/instances/i/serial-console",
538538
},
539539
],
540-
"silo (/system/silos/s)": [
540+
"silo (/system/silos/s/idps)": [
541541
{
542542
"label": "Silos",
543543
"path": "/system/silos",

app/util/path-builder.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ test('path builder', () => {
7979
"projectsNew": "/projects-new",
8080
"samlIdp": "/system/silos/s/idps/saml/pr",
8181
"serialConsole": "/projects/p/instances/i/serial-console",
82-
"silo": "/system/silos/s",
82+
"silo": "/system/silos/s/idps",
8383
"siloAccess": "/access",
8484
"siloFleetRoles": "/system/silos/s/fleet-roles",
8585
"siloIdps": "/system/silos/s/idps",

app/util/path-builder.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const vpcBase = ({ project, vpc }: PP.Vpc) => `${pb.vpcs({ project })}/${vpc}`
1818
export const instanceMetricsBase = ({ project, instance }: PP.Instance) =>
1919
`${instanceBase({ project, instance })}/metrics`
2020
export const inventoryBase = () => '/system/inventory'
21+
const siloBase = ({ silo }: PP.Silo) => `/system/silos/${silo}`
2122

2223
export const pb = {
2324
projects: () => `/projects`,
@@ -122,14 +123,15 @@ export const pb = {
122123

123124
silos: () => '/system/silos',
124125
silosNew: () => '/system/silos-new',
125-
silo: ({ silo }: PP.Silo) => `/system/silos/${silo}`,
126-
siloIdps: (params: PP.Silo) => `${pb.silo(params)}/idps`,
127-
siloIdpsNew: (params: PP.Silo) => `${pb.silo(params)}/idps-new`,
128-
siloIpPools: (params: PP.Silo) => `${pb.silo(params)}/ip-pools`,
129-
siloQuotas: (params: PP.Silo) => `${pb.silo(params)}/quotas`,
130-
siloFleetRoles: (params: PP.Silo) => `${pb.silo(params)}/fleet-roles`,
126+
// canonical route for silo is first tab
127+
silo: (params: PP.Silo) => pb.siloIdps(params),
128+
siloIdps: (params: PP.Silo) => `${siloBase(params)}/idps`,
129+
siloIdpsNew: (params: PP.Silo) => `${siloBase(params)}/idps-new`,
130+
siloIpPools: (params: PP.Silo) => `${siloBase(params)}/ip-pools`,
131+
siloQuotas: (params: PP.Silo) => `${siloBase(params)}/quotas`,
132+
siloFleetRoles: (params: PP.Silo) => `${siloBase(params)}/fleet-roles`,
131133
samlIdp: (params: PP.IdentityProvider) =>
132-
`${pb.silo(params)}/idps/saml/${params.provider}`,
134+
`${siloBase(params)}/idps/saml/${params.provider}`,
133135

134136
profile: () => '/settings/profile',
135137
sshKeys: () => '/settings/ssh-keys',

0 commit comments

Comments
 (0)