Skip to content

Make VpcNameFromId more linkCell-like #1918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-crespo merged 2 commits into from
Jan 29, 2024
Merged

Make VpcNameFromId more linkCell-like #1918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8386c4f
Add option `isLinkCell` to `VpcNameFromId`
benjaminleonard Jan 29, 2024
753d811
don't use VpcNameFromId on the instance table
david-crespo Jan 29, 2024
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
26 changes: 21 additions & 5 deletions app/pages/project/instances/instance/InstancePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
import { format } from 'date-fns'
import filesize from 'filesize'
import { useMemo } from 'react'
import { useNavigate, type LoaderFunctionArgs } from 'react-router-dom'
import { Link, useNavigate, type LoaderFunctionArgs } from 'react-router-dom'

import {
apiQueryClient,
useApiQuery,
useApiQueryClient,
usePrefetchedApiQuery,
type InstanceNetworkInterface,
Expand All @@ -33,7 +34,6 @@ import { getInstanceSelector, useInstanceSelector, useQuickActions } from 'app/h
import { pb } from 'app/util/path-builder'

import { useMakeInstanceActions } from '../actions'
import { VpcNameFromId } from './tabs/NetworkingTab'

function getPrimaryVpcId(nics: InstanceNetworkInterface[]) {
const nic = nics.find((nic) => nic.primary)
Expand Down Expand Up @@ -100,6 +100,15 @@ export function InstancePage() {
})
const primaryVpcId = getPrimaryVpcId(nics.items)

// a little funny, as noted in the loader -- this should always be prefetched
// when primaryVpcId is defined, but primaryVpcId might not be defined, so
// we can't use usePrefetchedApiQuery
const { data: vpc } = useApiQuery(
'vpcView',
{ path: { vpc: primaryVpcId! } },
{ enabled: !!primaryVpcId }
)

const actions = useMemo(
() => [
{
Expand Down Expand Up @@ -147,9 +156,16 @@ export function InstancePage() {
<InstanceStatusBadge status={instance.runState} />
</PropertiesTable.Row>
<PropertiesTable.Row label="vpc">
<span className="text-secondary">
{primaryVpcId ? VpcNameFromId({ value: primaryVpcId }) : <EmptyCell />}
</span>
{vpc ? (
<Link
className="link-with-underline group text-sans-semi-md"
to={pb.vpc({ project: instanceSelector.project, vpc: vpc.name })}
>
{vpc.name}
</Link>
) : (
<EmptyCell />
)}
Copy link
Collaborator

@david-crespo david-crespo Jan 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I considered doing this in #1882 but was too lazy. Glad to have the push to do it the ugly right way.

</PropertiesTable.Row>
</PropertiesTable>
<PropertiesTable>
Expand Down
8 changes: 5 additions & 3 deletions app/pages/project/instances/instance/tabs/NetworkingTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import { fancifyStates } from './common'

export const Skeleton = classed.div`h-4 w-12 rounded bg-tertiary motion-safe:animate-pulse`

export const VpcNameFromId = ({ value }: { value: string }) => {
const VpcNameFromId = ({ value }: { value: string }) => {
const projectSelector = useProjectSelector()
const { data: vpc, isError } = useApiQuery(
'vpcView',
Expand All @@ -58,10 +58,12 @@ export const VpcNameFromId = ({ value }: { value: string }) => {
if (!vpc) return <Skeleton />
return (
<Link
className="link-with-underline text-sans-semi-md"
className="link-with-underline group text-sans-semi-md"
to={pb.vpc({ ...projectSelector, vpc: vpc.name })}
>
{vpc.name}
{/* Pushes out the link area to the entire cell for improved clickability™ */}
<div className="absolute inset-0 right-px group-hover:bg-raise" />
<div className="relative">{vpc.name}</div>
</Link>
)
}
Expand Down