- {releaseQuery.data?.has_update ? (
+ {releaseQuery.data?.update_available ? (
有新版本
) : (
已是最新
diff --git a/Wavelet/frontend/app/(main)/components/upgrade-log-panel.tsx b/Wavelet/frontend/app/(main)/components/upgrade-log-panel.tsx
deleted file mode 100644
index eb3ce96b..00000000
--- a/Wavelet/frontend/app/(main)/components/upgrade-log-panel.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-'use client';
-
-import {Badge} from '@/components/ui/badge';
-import type {LatestReleaseInfo} from '@/lib/services/openflare';
-
-function formatLogTimestamp(value: string) {
- const date = new Date(value);
- if (Number.isNaN(date.getTime())) {
- return '0000-00-00 00:00:00.000';
- }
-
- const year = date.getFullYear();
- const month = `${date.getMonth() + 1}`.padStart(2, '0');
- const day = `${date.getDate()}`.padStart(2, '0');
- const hour = `${date.getHours()}`.padStart(2, '0');
- const minute = `${date.getMinutes()}`.padStart(2, '0');
- const second = `${date.getSeconds()}`.padStart(2, '0');
- const millisecond = `${date.getMilliseconds()}`.padStart(3, '0');
-
- return `${year}-${month}-${day} ${hour}:${minute}:${second}.${millisecond}`;
-}
-
-function formatLogLevel(level: string) {
- return (level || 'info').toUpperCase().padEnd(8, ' ');
-}
-
-function getUpgradeStatusBadge(release: LatestReleaseInfo) {
- if (release.upgrade_status === 'failed') {
- return { label: '升级失败', variant: 'destructive' as const };
- }
- if (release.upgrade_status === 'succeeded') {
- return { label: '准备重启', variant: 'default' as const };
- }
- if (release.in_progress) {
- return { label: '升级中', variant: 'secondary' as const };
- }
- return { label: '空闲', variant: 'outline' as const };
-}
-
-export function UpgradeLogPanel({release}: {release: LatestReleaseInfo}) {
- const statusBadge = getUpgradeStatusBadge(release);
- const upgradeLogs = release.upgrade_logs ?? [];
-
- if (upgradeLogs.length === 0) {
- return (
-
- 暂无升级日志
-
- );
- }
-
- return (
-
-
{statusBadge.label}
-
- {upgradeLogs.map((log, index) => (
-
- {formatLogTimestamp(log.created_at)}
- |
- {formatLogLevel(log.level)}
- |
- {log.message}
-
- ))}
-
-
- );
-}
\ No newline at end of file
diff --git a/Wavelet/frontend/app/(main)/components/version-upgrade-dialog.tsx b/Wavelet/frontend/app/(main)/components/version-upgrade-dialog.tsx
index 1d2674ac..b1cad6ea 100644
--- a/Wavelet/frontend/app/(main)/components/version-upgrade-dialog.tsx
+++ b/Wavelet/frontend/app/(main)/components/version-upgrade-dialog.tsx
@@ -1,6 +1,6 @@
'use client';
-import {useEffect, useState} from 'react';
+import {useEffect} from 'react';
import {ExternalLink, Loader2} from 'lucide-react';
import ReactMarkdown from 'react-markdown';
import remarkGfm from 'remark-gfm';
@@ -8,26 +8,28 @@ import remarkGfm from 'remark-gfm';
import {Badge} from '@/components/ui/badge';
import {Button} from '@/components/ui/button';
import {Card, CardContent, CardDescription, CardHeader, CardTitle} from '@/components/ui/card';
-import {Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle,} from '@/components/ui/dialog';
-import {Input} from '@/components/ui/input';
-import {Label} from '@/components/ui/label';
-import {Progress} from '@/components/ui/progress';
-import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs';
+import {
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogTrigger,
+} from '@/components/ui/alert-dialog';
+import {Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle} from '@/components/ui/dialog';
import {useOpenFlareServerUpgrade} from '@/lib/hooks/use-openflare-server-upgrade';
-import type {LatestReleaseInfo, ReleaseChannel} from '@/lib/services/openflare';
+import type {AppUpdateStatus} from '@/lib/services/admin/types';
import {formatDateTime} from '@/lib/utils';
import {formatRelativeTime} from '@/app/(main)/nodes/components/node-utils';
-import {UpgradeLogPanel} from './upgrade-log-panel';
-
-function getUpgradeBadge(release: LatestReleaseInfo | null | undefined) {
- if (!release) {
+function getUpgradeBadge(update: AppUpdateStatus | null | undefined) {
+ if (!update) {
return { label: '未检查', variant: 'outline' as const };
}
- if (release.in_progress) {
- return { label: '升级中', variant: 'secondary' as const };
- }
- if (release.has_update) {
+ if (update.update_available) {
return { label: '可升级', variant: 'secondary' as const };
}
return { label: '最新', variant: 'default' as const };
@@ -44,26 +46,15 @@ export function VersionUpgradeDialog({
}) {
const {
currentVersion,
- selectedChannel,
- release,
- uploadedBinary,
+ update,
releaseErrorMessage,
- manualStatusMessage,
- manualErrorMessage,
isInitialLoading,
isChecking,
isUpgrading,
- isUploadingBinary,
- uploadProgress,
- isConfirmingManualUpgrade,
handleOpen,
handleCheckRelease,
- handleChannelChange,
handleUpgrade,
- handleUploadBinary,
- handleConfirmManualUpgrade,
} = useOpenFlareServerUpgrade({ open, canUpgrade });
- const [selectedBinary, setSelectedBinary] = useState
(null);
useEffect(() => {
if (open) {
@@ -71,22 +62,8 @@ export function VersionUpgradeDialog({
}
}, [open, handleOpen]);
- useEffect(() => {
- if (!open) {
- setSelectedBinary(null);
- }
- }, [open]);
-
- const upgradeBadge = getUpgradeBadge(release);
- const selectedChannelLabel = selectedChannel === 'preview' ? '预览版' : '正式版';
- const uploadPhaseLabel =
- uploadProgress >= 100 ? '已上传，正在服务端校验版本...' : '上传中...';
- const canConfirmManualUpgrade = Boolean(
- uploadedBinary?.ready_to_upgrade && uploadedBinary.upload_token,
- );
-
- const isBusy =
- isChecking || isUpgrading || isUploadingBinary || isConfirmingManualUpgrade;
+ const upgradeBadge = getUpgradeBadge(update);
+ const isBusy = isChecking || isUpgrading;
return (