From 89c9be77114c9bde8901e83ac8c34dc07b30b36e Mon Sep 17 00:00:00 2001 From: Siyuan Miao Date: Mon, 24 Nov 2025 13:17:23 +0100 Subject: [PATCH] backport: versioning cloud app (0.4.4) --- ui/package-lock.json | 8 ++++---- ui/package.json | 1 + ui/src/components/Button.tsx | 6 +++--- ui/src/components/KvmCard.tsx | 27 ++++++++++++++++++++++++++- ui/src/main.tsx | 3 ++- ui/src/routes/devices.tsx | 9 ++++++++- 6 files changed, 44 insertions(+), 10 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 8ac57a18..f3856cb6 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -35,6 +35,7 @@ "react-use-websocket": "^4.13.0", "react-xtermjs": "^1.0.10", "recharts": "^2.15.3", + "semver": "^7.7.3", "tailwind-merge": "^3.3.0", "usehooks-ts": "^3.1.1", "validator": "^13.15.0", @@ -6070,10 +6071,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "bin": { "semver": "bin/semver.js" diff --git a/ui/package.json b/ui/package.json index eb9a9a3c..9a300692 100644 --- a/ui/package.json +++ b/ui/package.json @@ -46,6 +46,7 @@ "react-use-websocket": "^4.13.0", "react-xtermjs": "^1.0.10", "recharts": "^2.15.3", + "semver": "^7.7.3", "tailwind-merge": "^3.3.0", "usehooks-ts": "^3.1.1", "validator": "^13.15.0", diff --git a/ui/src/components/Button.tsx b/ui/src/components/Button.tsx index 97fcc5f6..854de607 100644 --- a/ui/src/components/Button.tsx +++ b/ui/src/components/Button.tsx @@ -211,7 +211,7 @@ export const Button = React.forwardRef( Button.displayName = "Button"; -type LinkPropsType = Pick & +type LinkPropsType = Pick & React.ComponentProps & { disabled?: boolean }; export const LinkButton = ({ to, ...props }: LinkPropsType) => { const classes = cx( @@ -224,13 +224,13 @@ export const LinkButton = ({ to, ...props }: LinkPropsType) => { if (to.toString().startsWith("http")) { return ( - + ); } else { return ( - + ); diff --git a/ui/src/components/KvmCard.tsx b/ui/src/components/KvmCard.tsx index 91296c5c..2e1e3175 100644 --- a/ui/src/components/KvmCard.tsx +++ b/ui/src/components/KvmCard.tsx @@ -2,6 +2,8 @@ import { MdConnectWithoutContact } from "react-icons/md"; import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react"; import { Link } from "react-router-dom"; import { LuEllipsisVertical } from "react-icons/lu"; +import semver from "semver"; +import { useMemo } from "react"; import Card from "@components/Card"; import { Button, LinkButton } from "@components/Button"; @@ -44,12 +46,33 @@ export default function KvmCard({ id, online, lastSeen, + appVersion, }: { title: string; id: string; online: boolean; lastSeen: Date | null; + appVersion: string; }) { + /** + * Constructs the URL for connecting to this KVM device's interface. + * + * Version 0.4.91 is the last backwards-compatible UI that works with older devices. + * Devices on v0.4.91 or below are served that version, while newer devices get + * their actual version. Unparseable versions fall back to 0.4.91 for safety. + */ + const kvmUrl = useMemo(() => { + const BACKWARDS_COMPATIBLE_VERSION = "0.4.91"; + + // Use device version if valid and >= 0.4.91, otherwise fall back to backwards-compatible version + const shouldUseDeviceVersion = + semver.valid(appVersion) && semver.gte(appVersion, BACKWARDS_COMPATIBLE_VERSION); + const version = shouldUseDeviceVersion ? appVersion : BACKWARDS_COMPATIBLE_VERSION; + + return new URL(`/v/${version}/devices/${id}`, window.location.origin).toString(); + }, [appVersion, id]); + + return (
@@ -88,7 +111,9 @@ export default function KvmCard({ text="Connect to KVM" LeadingIcon={MdConnectWithoutContact} textAlign="center" - to={`/devices/${id}`} + reloadDocument + target="_self" + to={kvmUrl} /> ) : (