From 13b4c201489897efad6721f9a90d9d062e3355fd Mon Sep 17 00:00:00 2001
From: Denozordec <shatskiy.blog@gmail.com>
Date: Wed, 20 May 2026 11:13:15 +0700
Subject: [PATCH] fix(web): show semver on monitoring from legacy /v1/version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

На проде API отдаёт только api_version и git_sha=unknown без поля version;
карточка показывала SHA вместо semver. Общий хелпер version-info.ts:
version → api_version, placeholder SHA не в заголовке.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 web/src/lib/api/version-info.ts              | 49 ++++++++++++++++++++
 web/src/lib/ui/app/layout/app-version.svelte | 15 ++----
 web/src/routes/monitoring/+page.svelte       | 37 +++++++--------
 3 files changed, 71 insertions(+), 30 deletions(-)
 create mode 100644 web/src/lib/api/version-info.ts

diff --git a/web/src/lib/api/version-info.ts b/web/src/lib/api/version-info.ts
new file mode 100644
index 0000000..58955a8
--- /dev/null
+++ b/web/src/lib/api/version-info.ts
@@ -0,0 +1,49 @@
+/** Ответ GET /v1/version (см. docs/openapi.yaml VersionInfo). */
+export type VersionInfo = {
+	version?: string;
+	api_version?: string;
+	git_sha?: string;
+	build_time?: string;
+};
+
+const PLACEHOLDER_SHA = new Set(['', 'unknown']);
+
+function nonEmptyString(value: unknown): string {
+	if (typeof value === 'string') {
+		const s = value.trim();
+		return s;
+	}
+	if (value == null) return '';
+	return String(value).trim();
+}
+
+/** Semver или legacy api_version; пустая строка, если полей нет. */
+export function resolveVersionString(info: VersionInfo | null | undefined): string {
+	if (!info) return '';
+	return nonEmptyString(info.version) || nonEmptyString(info.api_version);
+}
+
+/** Короткий git SHA; пусто для placeholder «unknown». */
+export function resolveGitSha(info: VersionInfo | null | undefined): string {
+	if (!info) return '';
+	const sha = nonEmptyString(info.git_sha);
+	if (!sha || PLACEHOLDER_SHA.has(sha.toLowerCase())) return '';
+	return sha;
+}
+
+/** Заголовок карточки «Версия» на /monitoring. */
+export function formatVersionHeadline(info: VersionInfo | null | undefined): string {
+	if (!info) return '—';
+	const ver = resolveVersionString(info);
+	const sha = resolveGitSha(info);
+	if (ver && sha) return `${ver} (${sha.slice(0, 12)})`;
+	if (ver) return ver;
+	if (sha) return sha.slice(0, 12);
+	return '—';
+}
+
+/** Подпись в сайдбаре (v1.2.3). */
+export function formatVersionSidebarLabel(info: VersionInfo | null | undefined): string | null {
+	const ver = resolveVersionString(info);
+	return ver ? `v${ver}` : null;
+}
diff --git a/web/src/lib/ui/app/layout/app-version.svelte b/web/src/lib/ui/app/layout/app-version.svelte
index 5bf0a54..5169e56 100644
--- a/web/src/lib/ui/app/layout/app-version.svelte
+++ b/web/src/lib/ui/app/layout/app-version.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import { apiJSON } from '$lib/api/client.js';
-
-	type VersionInfo = {
-		version?: string;
-		api_version?: string;
-	};
+	import {
+		formatVersionSidebarLabel,
+		type VersionInfo
+	} from '$lib/api/version-info.js';
 
 	let label = $state<string | null>(null);
 
@@ -13,11 +12,7 @@
 		void (async () => {
 			try {
 				const info = await apiJSON<VersionInfo>('/v1/version');
-				const ver =
-					(typeof info.version === 'string' && info.version) ||
-					(typeof info.api_version === 'string' && info.api_version) ||
-					'';
-				label = ver ? `v${ver}` : null;
+				label = formatVersionSidebarLabel(info);
 			} catch {
 				label = null;
 			}
diff --git a/web/src/routes/monitoring/+page.svelte b/web/src/routes/monitoring/+page.svelte
index a93cf1e..a4f0ff2 100644
--- a/web/src/routes/monitoring/+page.svelte
+++ b/web/src/routes/monitoring/+page.svelte
@@ -2,6 +2,11 @@
 	import { onMount } from 'svelte';
 	import { apiJSON, apiFetch } from '$lib/api/client.js';
 	import type { BirdStatus, JobsResponse } from '$lib/api/types.js';
+	import {
+		formatVersionHeadline,
+		resolveVersionString,
+		type VersionInfo
+	} from '$lib/api/version-info.js';
 	import { Badge } from '$lib/components/ui/badge/index.js';
 	import { Button } from '$lib/components/ui/button/index.js';
 	import {
@@ -21,12 +26,6 @@
 	import PageHeader from '$lib/ui/app/page-header/page-header.svelte';
 
 	type ReadyStatus = { status: string; checks?: Record<string, unknown> };
-	type VersionInfo = {
-		version?: string;
-		git_sha?: string;
-		build_time?: string;
-		[k: string]: unknown;
-	};
 	type JobsKpi = { running: number; failed: number; total: number };
 
 	let health = $state<{ ok: boolean; status?: string; error?: string } | null>(null);
@@ -98,16 +97,16 @@
 		return `${bird.bgp_established}/${bird.bgp_sessions_total}`;
 	});
 
-	const versionText = $derived.by(() => {
-		if (!version) return '—';
-		const ver =
-			(typeof version.version === 'string' && version.version) ||
-			(typeof version.api_version === 'string' && version.api_version) ||
-			'';
-		const sha =
-			typeof version.git_sha === 'string' && version.git_sha ? version.git_sha : 'unknown';
-		if (ver) return `${ver} (${sha.slice(0, 12)})`;
-		return sha.slice(0, 12);
+	const versionText = $derived(formatVersionHeadline(version));
+
+	const versionFooter = $derived.by(() => {
+		if (!version) return '';
+		const parts: string[] = [];
+		const ver = resolveVersionString(version);
+		if (ver) parts.push(`version: ${ver}`);
+		if (version.git_sha) parts.push(`git_sha: ${version.git_sha}`);
+		if (version.build_time) parts.push(`build: ${version.build_time}`);
+		return parts.join(' · ');
 	});
 
 	async function load() {
@@ -263,10 +262,8 @@
 				</div>
 				{#if versionError}
 					<p class="mt-2 text-xs text-destructive">{versionError}</p>
-				{:else if version}
-					<p class="mt-2 truncate text-xs text-muted-foreground">
-						api_version: {String(version.api_version ?? 'unknown')}
-					</p>
+				{:else if versionFooter}
+					<p class="mt-2 truncate text-xs text-muted-foreground">{versionFooter}</p>
 				{/if}
 			</CardContent>
 		</Card>