Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

Use the shared uptime formatter on monitor pages

Juan Denisf033edb70d45
diff --git a/frontend/src/pages/MonitorDetail.jsx b/frontend/src/pages/MonitorDetail.jsx
index 69373f59..411620c9 100644
--- a/frontend/src/pages/MonitorDetail.jsx
+++ b/frontend/src/pages/MonitorDetail.jsx
@@ -36,6 +36,7 @@ import { usePolling } from '@/hooks/usePolling';
import { useTranslation } from 'react-i18next';
import { toastError } from '@/utils/errorMessage';
import { formatDate, formatTime } from '@/utils/intl';
+import { formatUptimePercent } from '@/utils/uptime';
const POLL_MS = 15000;
@@ -122,10 +123,6 @@ function percentile(values, p) {
return sorted[Math.min(sorted.length - 1, Math.floor(sorted.length * p))];
}
-function formatUptime(value) {
- return value == null ? '—' : `${Number(value).toFixed(2)}%`;
-}
-
function certDaysLeft(iso) {
if (!iso) return null;
return Math.round((new Date(iso).getTime() - Date.now()) / 86400000);
@@ -440,10 +437,10 @@ export default function MonitorDetail() {
</MetricCard>
<MetricCard
label={t('app.monitorDetail.uptime30d', 'Uptime (30d)')} tone="accent" icon={<CheckCircle2 size={17} />}
- value={formatUptime(monitor.uptime_30d)}
+ value={formatUptimePercent(monitor.uptime_30d)}
>
<div className="mon-kpi-sub">
- 24h {formatUptime(monitor.uptime_24h)} {t('app.monitorDetail.7d', '· 7d')} {formatUptime(monitor.uptime_7d)}
+ 24h {formatUptimePercent(monitor.uptime_24h)} {t('app.monitorDetail.7d', '· 7d')} {formatUptimePercent(monitor.uptime_7d)}
</div>
</MetricCard>
<MetricCard
@@ -530,7 +527,7 @@ export default function MonitorDetail() {
['30d', monitor.uptime_30d], ['90d', monitor.uptime_90d]].map(([label, value]) => (
<div key={label}>
<span className="mon-statstrip__label">{label}</span>
- <span className="mon-statstrip__value">{formatUptime(value)}</span>
+ <span className="mon-statstrip__value">{formatUptimePercent(value)}</span>
</div>
))}
</div>
@@ -557,7 +554,7 @@ export default function MonitorDetail() {
<span className="mon-panel-sub">
{selectedDay.state === 'none'
? t('app.monitorDetail.notMonitoredOnThisDay', 'Not monitored on this day')
- : t('app.monitorDetail.daySummary', { count: selectedDay.checks, failed: selectedDay.down_checks, uptime: formatUptime(selectedDay.uptime), defaultValue_one: '{{count}} check · {{failed}} failed · {{uptime}} uptime', defaultValue_other: '{{count}} checks · {{failed}} failed · {{uptime}} uptime' })}
+ : t('app.monitorDetail.daySummary', { count: selectedDay.checks, failed: selectedDay.down_checks, uptime: formatUptimePercent(selectedDay.uptime), defaultValue_one: '{{count}} check · {{failed}} failed · {{uptime}} uptime', defaultValue_other: '{{count}} checks · {{failed}} failed · {{uptime}} uptime' })}
</span>
</div>
<Button variant="ghost" size="sm" onClick={() => setSelectedDay(null)}>{t('common.actions.close', 'Close')}</Button>
diff --git a/frontend/src/pages/Monitors.jsx b/frontend/src/pages/Monitors.jsx
index ed11a6c7..cc0e3460 100644
--- a/frontend/src/pages/Monitors.jsx
+++ b/frontend/src/pages/Monitors.jsx
@@ -40,6 +40,7 @@ import { CHECK_TYPES, MONITOR_STATUS, monitorStateOf } from '../components/monit
import { usePolling } from '@/hooks/usePolling';
import { useTranslation } from 'react-i18next';
import { toastError } from '@/utils/errorMessage';
+import { formatUptimePercent } from '@/utils/uptime';
const POLL_MS = 15000;
@@ -88,11 +89,6 @@ function countdown(iso) {
return `${Math.floor(seconds / 60)}m`;
}
-function formatUptime(value) {
- if (value == null) return '—';
- return `${Number(value).toFixed(2)}%`;
-}
-
// Built-in saved views, in the shared envelope (see ds/grid/viewState.js).
//
// `columnFilters` are CLIENT-side rules over the rows on screen; the page's own
@@ -396,7 +392,7 @@ export default function Monitors() {
key: 'uptime_30d',
headerKey: 'app.monitors.uptime30d', header: 'Uptime (30d)',
sortable: true,
- render: (m) => <span className="mon-uptime">{formatUptime(m.uptime_30d)}</span>,
+ render: (m) => <span className="mon-uptime">{formatUptimePercent(m.uptime_30d)}</span>,
},
{
key: 'last_check_at',