Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
2 changes: 1 addition & 1 deletion OMICRON_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
80e992229b52cecb517a59a0f686f8916549343f
8ca0aa3a78af86898b93b1114e57464b3c73dc30
100 changes: 99 additions & 1 deletion app/api/__generated__/Api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/api/__generated__/OMICRON_VERSION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions app/api/__generated__/msw-handlers.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 81 additions & 1 deletion app/api/__generated__/validate.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/components/DocsPopover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export const DocsPopoverLink = ({ href, linkText }: DocsPopoverLinkProps) => (
)

type DocsPopoverProps = {
/** Lower case because it appears as "Learn about ..." */
heading: string
icon: JSX.Element
links: Array<DocsPopoverLinkProps>
Expand Down
4 changes: 2 additions & 2 deletions app/layouts/ProjectLayoutBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function ProjectLayoutBase({ overrideContentPane }: ProjectLayoutProps) {
{ value: 'VPCs', path: pb.vpcs(projectSelector) },
{ value: 'Floating IPs', path: pb.floatingIps(projectSelector) },
{ value: 'Affinity Groups', path: pb.affinity(projectSelector) },
{ value: 'Access', path: pb.projectAccess(projectSelector) },
{ value: 'Project Access', path: pb.projectAccess(projectSelector) },
]
// filter out the entry for the path we're currently on
.filter((i) => i.path !== pathname)
Expand Down Expand Up @@ -118,7 +118,7 @@ export function ProjectLayoutBase({ overrideContentPane }: ProjectLayoutProps) {
<Affinity16Icon /> Affinity Groups
</NavLinkItem>
<NavLinkItem to={pb.projectAccess(projectSelector)}>
<Access16Icon /> Access
<Access16Icon /> Project Access
</NavLinkItem>
</Sidebar.Nav>
</Sidebar>
Expand Down
11 changes: 10 additions & 1 deletion app/layouts/SettingsLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
import { useMemo } from 'react'
import { useLocation, useNavigate } from 'react-router'

import { Folder16Icon, Key16Icon, Profile16Icon } from '@oxide/design-system/icons/react'
import {
Access16Icon,
Folder16Icon,
Key16Icon,
Profile16Icon,
} from '@oxide/design-system/icons/react'

import { TopBar } from '~/components/TopBar'
import { makeCrumb } from '~/hooks/use-crumbs'
Expand All @@ -31,6 +36,7 @@ export default function SettingsLayout() {
[
{ value: 'Profile', path: pb.profile() },
{ value: 'SSH Keys', path: pb.sshKeys() },
{ value: 'Access Tokens', path: pb.accessTokens() },
]
// filter out the entry for the path we're currently on
.filter((i) => i.path !== pathname)
Expand Down Expand Up @@ -61,6 +67,9 @@ export default function SettingsLayout() {
<NavLinkItem to={pb.sshKeys()}>
<Key16Icon /> SSH Keys
</NavLinkItem>
<NavLinkItem to={pb.accessTokens()}>
<Access16Icon /> Access Tokens
</NavLinkItem>
</Sidebar.Nav>
</Sidebar>
<ContentPane />
Expand Down
Loading
Loading