Skip to content
Closed
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
1 change: 1 addition & 0 deletions app/pages/project/vpcs/VpcPage/VpcPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export function VpcPage() {
<RouteTabs fullWidth>
<Tab to={pb.vpcFirewallRules(vpcSelector)}>Firewall Rules</Tab>
<Tab to={pb.vpcSubnets(vpcSelector)}>Subnets</Tab>
<Tab to={pb.vpcRouters(vpcSelector)}>Routers</Tab>
</RouteTabs>
</>
)
Expand Down
54 changes: 54 additions & 0 deletions app/pages/project/vpcs/VpcPage/tabs/VpcRoutersTab.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* Copyright Oxide Computer Company
*/
import { createColumnHelper } from '@tanstack/react-table'
import type { LoaderFunctionArgs } from 'react-router-dom'

import { type VpcRouter } from '~/api'
import { apiQueryClient } from '~/api/client'
import { getVpcSelector, useVpcSelector } from '~/hooks/use-params'
import { Columns } from '~/table/columns/common'
import { PAGE_SIZE, useQueryTable } from '~/table/QueryTable'
import { Badge } from '~/ui/lib/Badge'
import { EmptyMessage } from '~/ui/lib/EmptyMessage'

// import { pb } from '~/util/path-builder'

VpcRoutersTab.loader = async ({ params }: LoaderFunctionArgs) => {
const { project, vpc } = getVpcSelector(params)
await apiQueryClient.prefetchQuery('vpcRouterList', {
query: { project, vpc, limit: PAGE_SIZE },
})
return null
}

const colHelper = createColumnHelper<VpcRouter>()

const columns = [
colHelper.accessor('name', {}),
colHelper.accessor('kind', {
cell: (info) => <Badge color="neutral">{info.getValue()}</Badge>,
}),
colHelper.accessor('description', Columns.description),
colHelper.accessor('timeCreated', Columns.timeCreated),
]

export function VpcRoutersTab() {
const vpcSelector = useVpcSelector()
const { Table } = useQueryTable('vpcRouterList', { query: vpcSelector })

const emptyState = (
<EmptyMessage
title="No VPC routers"
body="Create a router to see it here"
// buttonText="New router"
// buttonTo={pb.vpcSubnetsNew(vpcSelector)}
/>
)

return <Table columns={columns} emptyState={emptyState} />
}
4 changes: 4 additions & 0 deletions app/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import { StorageTab } from './pages/project/instances/instance/tabs/StorageTab'
import { InstancesPage } from './pages/project/instances/InstancesPage'
import { SnapshotsPage } from './pages/project/snapshots/SnapshotsPage'
import { VpcFirewallRulesTab } from './pages/project/vpcs/VpcPage/tabs/VpcFirewallRulesTab'
import { VpcRoutersTab } from './pages/project/vpcs/VpcPage/tabs/VpcRoutersTab'
import { VpcSubnetsTab } from './pages/project/vpcs/VpcPage/tabs/VpcSubnetsTab'
import { VpcPage } from './pages/project/vpcs/VpcPage/VpcPage'
import { VpcsPage } from './pages/project/vpcs/VpcsPage'
Expand Down Expand Up @@ -390,6 +391,9 @@ export const routes = createRoutesFromElements(
handle={{ crumb: 'Edit Subnet' }}
/>
</Route>
<Route element={<VpcRoutersTab />} loader={VpcRoutersTab.loader}>
<Route path="routers" handle={{ crumb: 'Routers' }} />
</Route>
</Route>
</Route>
</Route>
Expand Down
1 change: 1 addition & 0 deletions app/util/path-builder.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ test('path builder', () => {
"vpcFirewallRuleEdit": "/projects/p/vpcs/v/firewall-rules/fr/edit",
"vpcFirewallRules": "/projects/p/vpcs/v/firewall-rules",
"vpcFirewallRulesNew": "/projects/p/vpcs/v/firewall-rules-new",
"vpcRouters": "/projects/p/vpcs/v/routers",
"vpcSubnets": "/projects/p/vpcs/v/subnets",
"vpcSubnetsEdit": "/projects/p/vpcs/v/subnets/su/edit",
"vpcSubnetsNew": "/projects/p/vpcs/v/subnets-new",
Expand Down
1 change: 1 addition & 0 deletions app/util/path-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export const pb = {
vpcFirewallRuleEdit: (params: FirewallRule) =>
`${pb.vpcFirewallRules(params)}/${params.rule}/edit`,
vpcSubnets: (params: Vpc) => `${vpcBase(params)}/subnets`,
vpcRouters: (params: Vpc) => `${vpcBase(params)}/routers`,
vpcSubnetsNew: (params: Vpc) => `${vpcBase(params)}/subnets-new`,
vpcSubnetsEdit: (params: VpcSubnet) => `${pb.vpcSubnets(params)}/${params.subnet}/edit`,

Expand Down
1 change: 1 addition & 0 deletions mock-api/msw/db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ const initDb = {
users: [...mock.users],
vpcFirewallRules: [...mock.firewallRules],
vpcs: [...mock.vpcs],
vpcRouters: [...mock.vpcRouters],
vpcSubnets: [mock.vpcSubnet],
}

Expand Down
11 changes: 9 additions & 2 deletions mock-api/msw/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1301,6 +1301,15 @@ export const handlers = makeHandlers({
},
siloMetric: handleMetrics,

vpcRouterList({ query }) {
const vpc = lookup.vpc(query)
const routers = db.vpcRouters.filter((r) => r.vpc_id === vpc.id)
return paginated(query, routers)
},
vpcRouterRouteList() {
return { items: [] }
},

// Misc endpoints we're not using yet in the console
certificateCreate: NotImplemented,
certificateDelete: NotImplemented,
Expand Down Expand Up @@ -1373,10 +1382,8 @@ export const handlers = makeHandlers({
userBuiltinView: NotImplemented,
vpcRouterCreate: NotImplemented,
vpcRouterDelete: NotImplemented,
vpcRouterList: NotImplemented,
vpcRouterRouteCreate: NotImplemented,
vpcRouterRouteDelete: NotImplemented,
vpcRouterRouteList: NotImplemented,
vpcRouterRouteUpdate: NotImplemented,
vpcRouterRouteView: NotImplemented,
vpcRouterUpdate: NotImplemented,
Expand Down
14 changes: 13 additions & 1 deletion mock-api/vpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Copyright Oxide Computer Company
*/

import type { Vpc, VpcFirewallRule, VpcSubnet } from '@oxide/api'
import type { Vpc, VpcFirewallRule, VpcRouter, VpcSubnet } from '@oxide/api'

import type { Json } from './json-type'
import { project, project2 } from './project'
Expand Down Expand Up @@ -174,3 +174,15 @@ export const firewallRules: Json<VpcFirewallRule[]> = [
vpc_id: vpc2.id,
},
]

export const vpcRouters: Json<VpcRouter[]> = [
{
id: '9715d7cf-0e29-4c66-92dc-642961f9a3cb',
name: 'default',
kind: 'system',
description: '',
time_created,
time_modified,
vpc_id: vpc.id,
},
]