pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-10-29 15:09:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add olm agentVersion to separate the library from the agent

Browse Source
This commit is contained in:
Owen
2026-10-22 14:59:33 -04:00
parent 8b509da19f
commit 290f1f2ff0
14 changed files with 107 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/[orgId]/settings/clients/machine/page.tsx
+1
View File
@@ -89,6 +89,7 @@ export default async function ClientsPage(props: ClientsPageProps) {
orgId: params.orgId,
online: client.online,
olmVersion: client.olmVersion || undefined,
agentVersion: client.agentVersion || undefined,
olmUpdateAvailable: client.olmUpdateAvailable || false,
userId: client.userId,
username: client.username,
src/app/[orgId]/settings/clients/user/page.tsx
+1
View File
@@ -92,6 +92,7 @@ export default async function ClientsPage(props: ClientsPageProps) {
orgId: params.orgId,
online: client.online,
olmVersion: client.olmVersion || undefined,
agentVersion: client.agentVersion || undefined,
olmUpdateAvailable: Boolean(client.olmUpdateAvailable),
userId: client.userId,
username: client.username,
src/components/ClientInfoCard.tsx
+12 -11
View File
@@ -44,26 +44,29 @@ export default function SiteInfoCard({}: ClientInfoCardProps) {
const data = useQuery(productUpdatesQueries.latestVersion(true));
const latestPlatformVersions = data.data?.data;
// agentVersion was added after olmVersion, and older olm clients report
// the app version in olmVersion, so fall back to it for clients that have
// not re-registered yet.
const agentVersion = client.agentVersion ?? client.olmVersion;
let updateAvailable = false;
if (client.agent && client.olmVersion && latestPlatformVersions) {
if (client.agent && agentVersion && latestPlatformVersions) {
const agent = agentVersionMap[
client.agent
] as keyof LatestVersionResponse;
if (agent in latestPlatformVersions) {
const agentVersion = latestPlatformVersions[agent];
const latestAgentVersion = latestPlatformVersions[agent];
updateAvailable = Boolean(
semver.valid(client.olmVersion) &&
semver.lt(client.olmVersion, agentVersion.latestVersion)
semver.valid(agentVersion) &&
semver.lt(agentVersion, latestAgentVersion.latestVersion)
);
}
}
const cols =
2 +
(userDisplayName ? 1 : 0) +
(client.agent && client.olmVersion ? 1 : 0);
2 + (userDisplayName ? 1 : 0) + (client.agent && agentVersion ? 1 : 0);
return (
<Alert>
@@ -73,15 +76,13 @@ export default function SiteInfoCard({}: ClientInfoCardProps) {
<InfoSectionTitle>{t("name")}</InfoSectionTitle>
<InfoSectionContent>{client.name}</InfoSectionContent>
</InfoSection>
{client.agent && client.olmVersion ? (
{client.agent && agentVersion ? (
<InfoSection>
<InfoSectionTitle>{t("agent")}</InfoSectionTitle>
<InfoSectionContent>
<div className="flex items-center gap-2">
<span>
{client.agent +
" v" +
client.olmVersion}
{client.agent + " v" + agentVersion}
</span>
{updateAvailable && (
<InfoPopup
src/components/MachineClientsTable.tsx
+15 -7
View File
@@ -56,6 +56,7 @@ export type ClientRow = {
orgId: string;
online: boolean;
olmVersion?: string;
agentVersion?: string;
olmUpdateAvailable: boolean;
userId: string | null;
username: string | null;
@@ -397,10 +398,16 @@ export default function MachineClientsTable({
"Olm CLI": "olm"
};
// agentVersion was added after olmVersion, and older olm
// clients report the app version in olmVersion, so fall
// back to it for rows that have not re-registered yet.
const displayedVersion =
originalRow.agentVersion ?? originalRow.olmVersion;
let updateAvailable = false;
if (
originalRow.olmVersion &&
displayedVersion &&
originalRow.agent &&
latestPlatformVersions
) {
@@ -409,13 +416,14 @@ export default function MachineClientsTable({
] as keyof LatestVersionResponse;
if (agent in latestPlatformVersions) {
const agentVersion = latestPlatformVersions[agent];
const latestAgentVersion =
latestPlatformVersions[agent];
updateAvailable = Boolean(
semver.valid(originalRow.olmVersion) &&
semver.valid(displayedVersion) &&
semver.lt(
originalRow.olmVersion,
agentVersion.latestVersion
displayedVersion,
latestAgentVersion.latestVersion
)
);
}
@@ -423,11 +431,11 @@ export default function MachineClientsTable({
return (
<div className="flex items-center space-x-1">
{originalRow.agent && originalRow.olmVersion ? (
{originalRow.agent && displayedVersion ? (
<Badge variant="secondary">
{originalRow.agent +
" v" +
originalRow.olmVersion}
displayedVersion}
</Badge>
) : (
"-"
src/components/UserDevicesTable.tsx
+15 -7
View File
@@ -55,6 +55,7 @@ export type ClientRow = {
orgId: string;
online: boolean;
olmVersion?: string;
agentVersion?: string;
olmUpdateAvailable: boolean;
userId: string | null;
username: string | null;
@@ -578,10 +579,16 @@ export default function UserDevicesTable({
"Olm CLI": "olm"
};
// agentVersion was added after olmVersion, and older olm
// clients report the app version in olmVersion, so fall
// back to it for rows that have not re-registered yet.
const displayedVersion =
originalRow.agentVersion ?? originalRow.olmVersion;
let updateAvailable = false;
if (
originalRow.olmVersion &&
displayedVersion &&
originalRow.agent &&
latestPlatformVersions
) {
@@ -590,13 +597,14 @@ export default function UserDevicesTable({
] as keyof LatestVersionResponse;
if (agent in latestPlatformVersions) {
const agentVersion = latestPlatformVersions[agent];
const latestAgentVersion =
latestPlatformVersions[agent];
updateAvailable = Boolean(
semver.valid(originalRow.olmVersion) &&
semver.valid(displayedVersion) &&
semver.lt(
originalRow.olmVersion,
agentVersion.latestVersion
displayedVersion,
latestAgentVersion.latestVersion
)
);
}
@@ -604,11 +612,11 @@ export default function UserDevicesTable({
return (
<div className="flex items-center space-x-1">
{originalRow.agent && originalRow.olmVersion ? (
{originalRow.agent && displayedVersion ? (
<Badge variant="secondary">
{originalRow.agent +
" v" +
originalRow.olmVersion}
displayedVersion}
</Badge>
) : (
"-"