mirror of
https://github.com/fosrl/pangolin.git
synced 2026-09-16 07:40:04 +02:00
Store the cli version for display and handle auto update
This commit is contained in:
@@ -74,6 +74,8 @@ export default async function PendingSitesPage(props: PendingSitesPageProps) {
|
||||
type: site.type as any,
|
||||
online: site.online,
|
||||
newtVersion: site.newtVersion || undefined,
|
||||
agent: site.agent || undefined,
|
||||
agentVersion: site.agentVersion || undefined,
|
||||
newtUpdateAvailable: site.newtUpdateAvailable || false,
|
||||
exitNodeName: site.exitNodeName || undefined,
|
||||
exitNodeEndpoint: site.exitNodeEndpoint || undefined,
|
||||
|
||||
@@ -70,6 +70,8 @@ export default async function SitesPage(props: SitesPageProps) {
|
||||
type: site.type as any,
|
||||
online: site.online,
|
||||
newtVersion: site.newtVersion || undefined,
|
||||
agent: site.agent || undefined,
|
||||
agentVersion: site.agentVersion || undefined,
|
||||
newtUpdateAvailable: site.newtUpdateAvailable || false,
|
||||
exitNodeName: site.exitNodeName || undefined,
|
||||
exitNodeEndpoint: site.exitNodeEndpoint || undefined,
|
||||
|
||||
@@ -319,13 +319,16 @@ export default function PendingSitesTable({
|
||||
const originalRow = row.original;
|
||||
|
||||
if (originalRow.type === "newt") {
|
||||
const isCli = originalRow.agent === "cli";
|
||||
return (
|
||||
<div className="flex items-center space-x-1">
|
||||
<Badge variant="secondary">
|
||||
<div className="flex items-center space-x-1">
|
||||
<span>Newt</span>
|
||||
{originalRow.newtVersion && (
|
||||
<span>v{originalRow.newtVersion}</span>
|
||||
<span>{isCli ? "CLI" : "Newt"}</span>
|
||||
{originalRow.agentVersion && (
|
||||
<span>
|
||||
v{originalRow.agentVersion}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</Badge>
|
||||
|
||||
@@ -63,6 +63,7 @@ export default function SiteInfoCard({}: SiteInfoCardProps) {
|
||||
) : null;
|
||||
|
||||
if (site.type === "newt") {
|
||||
const isCli = site.agent === "cli";
|
||||
return (
|
||||
<Alert>
|
||||
<AlertDescription>
|
||||
@@ -72,15 +73,17 @@ export default function SiteInfoCard({}: SiteInfoCardProps) {
|
||||
<InfoSectionTitle>
|
||||
{t("connectionType")}
|
||||
</InfoSectionTitle>
|
||||
<InfoSectionContent>Newt</InfoSectionContent>
|
||||
<InfoSectionContent>
|
||||
{isCli ? "CLI" : "Newt"}
|
||||
</InfoSectionContent>
|
||||
</InfoSection>
|
||||
<InfoSection>
|
||||
<InfoSectionTitle>
|
||||
{t("newtVersion")}
|
||||
</InfoSectionTitle>
|
||||
<InfoSectionContent>
|
||||
{site.newtVersion
|
||||
? `v${site.newtVersion}`
|
||||
{site.agentVersion
|
||||
? `v${site.agentVersion}`
|
||||
: "-"}
|
||||
</InfoSectionContent>
|
||||
</InfoSection>
|
||||
|
||||
@@ -67,6 +67,8 @@ export type SiteRow = {
|
||||
orgId: string;
|
||||
type: "newt" | "wireguard" | "local";
|
||||
newtVersion?: string;
|
||||
agent?: string;
|
||||
agentVersion?: string;
|
||||
newtUpdateAvailable?: boolean;
|
||||
online?: boolean | null;
|
||||
address?: string;
|
||||
@@ -384,14 +386,17 @@ export default function SitesTable({
|
||||
);
|
||||
|
||||
if (originalRow.type === "newt") {
|
||||
const isCli = originalRow.agent === "cli";
|
||||
return (
|
||||
<div className="flex items-center space-x-1">
|
||||
<Badge variant="secondary">
|
||||
<div className="flex items-center space-x-1">
|
||||
<span>Newt</span>
|
||||
{originalRow.newtVersion && (
|
||||
<span>
|
||||
{isCli ? "CLI" : "Newt"}
|
||||
</span>
|
||||
{originalRow.agentVersion && (
|
||||
<span>
|
||||
v{originalRow.newtVersion}
|
||||
v{originalRow.agentVersion}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user