Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/pages/system/silos/SiloFleetRolesTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { usePrefetchedApiQuery } from '@oxide/api'
import { Cloud24Icon, NextArrow12Icon } from '@oxide/design-system/icons/react'
import { Badge } from '@oxide/design-system/ui'

import { makeCrumb } from '~/hooks/use-crumbs'
import { useSiloSelector } from '~/hooks/use-params'
import { EmptyMessage } from '~/ui/lib/EmptyMessage'
import { TableEmptyBox } from '~/ui/lib/Table'
Expand Down Expand Up @@ -51,3 +52,5 @@ export default function SiloFleetRolesTab() {
</>
)
}

export const handle = makeCrumb('Fleet Roles')
5 changes: 5 additions & 0 deletions app/pages/system/silos/SiloIdpsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { Cloud24Icon } from '@oxide/design-system/icons/react'
import { Badge } from '@oxide/design-system/ui'

import { getListQFn, queryClient, type IdentityProvider } from '~/api'
import { makeCrumb } from '~/hooks/use-crumbs'
import { getSiloSelector, useSiloSelector } from '~/hooks/use-params'
import { LinkCell } from '~/table/cells/LinkCell'
import { Columns } from '~/table/columns/common'
Expand Down Expand Up @@ -74,3 +75,7 @@ export default function SiloIdpsTab() {
</>
)
}

export const handle = makeCrumb('Identity Providers', (params) =>
pb.siloIdps(getSiloSelector(params))
)
3 changes: 3 additions & 0 deletions app/pages/system/silos/SiloIpPoolsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { Networking24Icon } from '@oxide/design-system/icons/react'

import { ComboboxField } from '~/components/form/fields/ComboboxField'
import { HL } from '~/components/HL'
import { makeCrumb } from '~/hooks/use-crumbs'
import { getSiloSelector, useSiloSelector } from '~/hooks/use-params'
import { confirmAction } from '~/stores/confirm-action'
import { addToast } from '~/stores/toast'
Expand Down Expand Up @@ -198,6 +199,8 @@ export default function SiloIpPoolsTab() {
)
}

export const handle = makeCrumb('IP Pools')

type LinkPoolFormValues = {
pool: string | undefined
}
Expand Down
5 changes: 4 additions & 1 deletion app/pages/system/silos/SiloPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ export async function clientLoader({ params }: LoaderFunctionArgs) {
return null
}

export const handle = makeCrumb((p) => p.silo!)
export const handle = makeCrumb(
(p) => p.silo!,
(p) => pb.silo(getSiloSelector(p))
)

export default function SiloPage() {
const siloSelector = useSiloSelector()
Expand Down
3 changes: 3 additions & 0 deletions app/pages/system/silos/SiloQuotasTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
} from '~/api'
import { NumberField } from '~/components/form/fields/NumberField'
import { SideModalForm } from '~/components/form/SideModalForm'
import { makeCrumb } from '~/hooks/use-crumbs'
import { getSiloSelector, useSiloSelector } from '~/hooks/use-params'
import { addToast } from '~/stores/toast'
import { Button } from '~/ui/lib/Button'
Expand Down Expand Up @@ -97,6 +98,8 @@ export default function SiloQuotasTab() {
)
}

export const handle = makeCrumb('Quotas')

function EditQuotasForm({ onDismiss }: { onDismiss: () => void }) {
const { silo } = useSiloSelector()
const { data: utilization } = usePrefetchedQuery(
Expand Down
3 changes: 3 additions & 0 deletions app/pages/system/silos/SiloScimTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
usePrefetchedApiQuery,
type ScimClientBearerToken,
} from '~/api'
import { makeCrumb } from '~/hooks/use-crumbs'
import { getSiloSelector, useSiloSelector } from '~/hooks/use-params'
import { confirmDelete } from '~/stores/confirm-delete'
import { addToast } from '~/stores/toast'
Expand Down Expand Up @@ -174,6 +175,8 @@ export default function SiloScimTab() {
)
}

export const handle = makeCrumb('SCIM')

function CreateTokenModal({
siloSelector,
onDismiss,
Expand Down
48 changes: 40 additions & 8 deletions app/util/__snapshots__/path-builder.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "Identity Providers",
"path": "/system/silos/s/idps",
},
],
"serialConsole (/projects/p/instances/i/serial-console)": [
Expand Down Expand Up @@ -544,7 +548,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "Identity Providers",
"path": "/system/silos/s/idps",
},
],
"siloAccess (/access)": [
Expand All @@ -560,7 +568,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "Fleet Roles",
"path": "/system/silos/s/fleet-roles",
},
],
"siloIdps (/system/silos/s/idps)": [
Expand All @@ -570,7 +582,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "Identity Providers",
"path": "/system/silos/s/idps",
},
],
"siloIdpsNew (/system/silos/s/idps-new)": [
Expand All @@ -580,7 +596,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "Identity Providers",
"path": "/system/silos/s/idps",
},
],
"siloImageEdit (/images/im/edit)": [
Expand All @@ -602,7 +622,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "IP Pools",
"path": "/system/silos/s/ip-pools",
},
],
"siloQuotas (/system/silos/s/quotas)": [
Expand All @@ -612,7 +636,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "Quotas",
"path": "/system/silos/s/quotas",
},
],
"siloScim (/system/silos/s/scim)": [
Expand All @@ -622,7 +650,11 @@ exports[`breadcrumbs 2`] = `
},
{
"label": "s",
"path": "/system/silos/s",
"path": "/system/silos/s/idps",
},
{
"label": "SCIM",
"path": "/system/silos/s/scim",
},
],
"siloUtilization (/utilization)": [
Expand Down
12 changes: 11 additions & 1 deletion test/e2e/breadcrumbs.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,24 @@ test('breadcrumbs', async ({ page }) => {
await page.goto('/system/silos/maze-war')
const siloCrumbs: Pair[] = [
['Silos', '/system/silos'],
['maze-war', '/system/silos/maze-war'],
['maze-war', '/system/silos/maze-war/idps'],
['Identity Providers', '/system/silos/maze-war/idps'],
]
await expectCrumbs(page, siloCrumbs)
// same crumbs on IdP detail side modal
await page.getByRole('link', { name: 'mock-idp' }).click()
await expect(page).toHaveURL('/system/silos/maze-war/idps/saml/mock-idp')
await expectCrumbs(page, siloCrumbs)

await page.keyboard.press('Escape')
await page.getByRole('tab', { name: 'Fleet Roles' }).click()
await expect(page).toHaveURL('/system/silos/maze-war/fleet-roles')
await expectCrumbs(page, [
['Silos', '/system/silos'],
['maze-war', '/system/silos/maze-war/idps'],
['Fleet Roles', '/system/silos/maze-war/fleet-roles'],
])

await page.goto('/system/networking/ip-pools/ip-pool-1')
const poolCrumbs: Pair[] = [
['IP Pools', '/system/networking/ip-pools'],
Expand Down
Loading