Skip to content

make all external IPs in header copyable #2170

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
charliepark merged 4 commits into from
Apr 22, 2024
Merged

make all external IPs in header copyable #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6162db5
make all external IPs copyable
charliepark Apr 19, 2024
1618926
Update test
charliepark Apr 19, 2024
7db4f0d
keep IPs as links
charliepark Apr 19, 2024
5ec256a
add space between IP and copy icon
charliepark Apr 22, 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
41 changes: 18 additions & 23 deletions app/components/ExternalIps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,25 @@ export function ExternalIps({ project, instance }: InstanceSelector) {
if (isPending) return <SkeletonCell />

const ips = data?.items
? intersperse(
data.items.map((eip) => <IpLink ip={eip.ip} key={eip.ip} />),
<span className="text-quinary"> / </span>
)
: undefined

if (!ips || ips.length === 0) return <EmptyCell />
return (
<div className="flex items-center gap-1 text-secondary">
{ips && ips.length > 0 ? ips : <EmptyCell />}
{/* If there's exactly one IP here, render a copy to clipboard button */}
{data?.items.length === 1 && <CopyToClipboard text={data.items[0].ip} />}
<div className="flex items-center gap-1">
{intersperse(
ips.map((eip) => (
<span className="flex items-center gap-1" key={eip.ip}>
<a
className="link-with-underline text-sans-semi-md"
href={`https://${eip.ip}`}
target="_blank"
rel="noreferrer"
>
{eip.ip}
</a>
<CopyToClipboard text={eip.ip} />

@david-crespo david-crespo Apr 19, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think this needs an ml-1 to do what the gap-1 was doing when this was at top level. I was afraid it would then look too close to the slash on the right, but it seems fine to me.

before

image

after

image

@benjaminleonard benjaminleonard Apr 19, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yep +1

</span>
)),
<span className="text-quinary"> / </span>
)}
</div>
)
}

function IpLink({ ip }: { ip: string }) {
return (
<a
className="link-with-underline text-sans-semi-md"
href={`https://${ip}`}
target="_blank"
rel="noreferrer"
>
{ip}
</a>
)
}
2 changes: 1 addition & 1 deletion app/pages/project/instances/instance/InstancePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export function InstancePage() {
{instance.id}
</span>
</PropertiesTable.Row>
<PropertiesTable.Row label="external IP">
<PropertiesTable.Row label="external IPs">
{<ExternalIps {...instanceSelector} />}
</PropertiesTable.Row>
</PropertiesTable>
Expand Down