Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
39fac7834f | ||
|
|
d267e40157 |
@@ -1,5 +1,5 @@
|
||||
import { Fragment, useMemo } from 'react'
|
||||
import { Link, useMatches, useRouterState } from '@tanstack/react-router'
|
||||
import { useMemo } from 'react'
|
||||
import {
|
||||
Breadcrumb,
|
||||
BreadcrumbItem,
|
||||
@@ -12,82 +12,12 @@ import { Separator } from '@cfdm/ui/components/separator'
|
||||
import { SystemMonitorPopover } from '@/components/layout/system-monitor-popover'
|
||||
import { AppsMenu } from '@/components/layout/apps-menu'
|
||||
import { SidebarTrigger } from '@cfdm/ui/components/sidebar'
|
||||
import { getBreadcrumbs } from '@/lib/breadcrumbs'
|
||||
|
||||
export interface RouteBreadcrumbLoaderData {
|
||||
breadcrumb?: string
|
||||
}
|
||||
|
||||
const routeTitles: Record<string, string> = {
|
||||
'/': 'Панель управления',
|
||||
'/domains': 'Домены',
|
||||
'/groups': 'Группы доменов',
|
||||
'/services': 'Сервисы',
|
||||
'/certificates': 'Сертификаты',
|
||||
'/settings/appearance': 'Внешний вид',
|
||||
'/settings/health': 'Health-check',
|
||||
'/settings/integrations': 'Интеграции',
|
||||
}
|
||||
|
||||
function getBreadcrumbs(
|
||||
pathname: string,
|
||||
dynamicLabels: Record<string, string>,
|
||||
) {
|
||||
if (pathname === '/') {
|
||||
return [{ label: 'Панель управления', href: '/' }]
|
||||
}
|
||||
|
||||
if (pathname.match(/^\/services\/\d+$/)) {
|
||||
return [
|
||||
{ label: 'Сервисы', href: '/services' },
|
||||
{ label: dynamicLabels[pathname] ?? 'Сервис', href: pathname },
|
||||
]
|
||||
}
|
||||
|
||||
if (pathname.match(/^\/groups\/\d+$/)) {
|
||||
return [
|
||||
{ label: 'Группы доменов', href: '/groups' },
|
||||
{ label: dynamicLabels[pathname] ?? 'Группа', href: pathname },
|
||||
]
|
||||
}
|
||||
|
||||
if (pathname.match(/^\/domains\/\d+\/dns$/)) {
|
||||
const domainId = pathname.split('/')[2]
|
||||
const domainPath = `/domains/${domainId}`
|
||||
return [
|
||||
{ label: 'Домены', href: '/domains' },
|
||||
{ label: dynamicLabels[domainPath] ?? 'Домен', href: domainPath },
|
||||
{ label: 'DNS', href: pathname },
|
||||
]
|
||||
}
|
||||
|
||||
if (pathname.match(/^\/domains\/\d+$/)) {
|
||||
return [
|
||||
{ label: 'Домены', href: '/domains' },
|
||||
{ label: dynamicLabels[pathname] ?? 'Обзор домена', href: pathname },
|
||||
]
|
||||
}
|
||||
|
||||
if (pathname.startsWith('/settings')) {
|
||||
return [
|
||||
{ label: 'Настройки', href: '/settings/appearance' },
|
||||
...(pathname === '/settings/integrations'
|
||||
? [{ label: 'Интеграции', href: pathname }]
|
||||
: pathname === '/settings/health'
|
||||
? [{ label: 'Health-check', href: pathname }]
|
||||
: pathname === '/settings/appearance'
|
||||
? [{ label: 'Внешний вид', href: pathname }]
|
||||
: []),
|
||||
]
|
||||
}
|
||||
|
||||
const title = routeTitles[pathname]
|
||||
if (title) {
|
||||
return [{ label: title, href: pathname }]
|
||||
}
|
||||
|
||||
return [{ label: 'Панель управления', href: '/' }]
|
||||
}
|
||||
|
||||
function useDynamicBreadcrumbLabels() {
|
||||
const matches = useMatches()
|
||||
return useMemo(() => {
|
||||
@@ -106,7 +36,10 @@ function useDynamicBreadcrumbLabels() {
|
||||
export function SiteHeader() {
|
||||
const pathname = useRouterState({ select: (s) => s.location.pathname })
|
||||
const dynamicLabels = useDynamicBreadcrumbLabels()
|
||||
const crumbs = getBreadcrumbs(pathname, dynamicLabels)
|
||||
const crumbs = useMemo(
|
||||
() => getBreadcrumbs(pathname, dynamicLabels),
|
||||
[pathname, dynamicLabels],
|
||||
)
|
||||
|
||||
return (
|
||||
<header className="bg-background sticky top-0 z-10 flex h-12 shrink-0 items-center gap-2 border-b px-4 md:px-6">
|
||||
@@ -117,10 +50,10 @@ export function SiteHeader() {
|
||||
{crumbs.map((crumb, index) => {
|
||||
const isLast = index === crumbs.length - 1
|
||||
return (
|
||||
<span key={crumb.href} className="contents">
|
||||
{index > 0 && (
|
||||
<Fragment key={`${index}-${crumb.href}`}>
|
||||
{index > 0 ? (
|
||||
<BreadcrumbSeparator className="hidden md:block" />
|
||||
)}
|
||||
) : null}
|
||||
<BreadcrumbItem
|
||||
className={index === 0 && !isLast ? 'hidden md:block' : undefined}
|
||||
>
|
||||
@@ -132,7 +65,7 @@ export function SiteHeader() {
|
||||
</BreadcrumbLink>
|
||||
)}
|
||||
</BreadcrumbItem>
|
||||
</span>
|
||||
</Fragment>
|
||||
)
|
||||
})}
|
||||
</BreadcrumbList>
|
||||
|
||||
@@ -298,45 +298,50 @@ export function HealthSourceFilterBar({
|
||||
const active = selected.length > 0 ? selected : enabled
|
||||
|
||||
return (
|
||||
<ToggleGroup
|
||||
multiple
|
||||
variant="outline"
|
||||
size="sm"
|
||||
className="w-full min-w-0"
|
||||
value={active}
|
||||
aria-label="Тип пробы"
|
||||
onValueChange={(next) => {
|
||||
const values = next.filter((value): value is HealthProvider =>
|
||||
visible.some((item) => item.id === value),
|
||||
)
|
||||
if (values.length === 0) return
|
||||
onChange(values)
|
||||
}}
|
||||
>
|
||||
{visible.map((item) => (
|
||||
<ToggleGroupItem
|
||||
key={item.id}
|
||||
value={item.id}
|
||||
aria-label={item.title}
|
||||
className="min-w-0 flex-1 gap-1.5"
|
||||
>
|
||||
<IconTile
|
||||
variant="elevated"
|
||||
size="xs"
|
||||
className={item.iconClassName}
|
||||
aria-hidden="true"
|
||||
<div className="@container min-w-0 w-full">
|
||||
<ToggleGroup
|
||||
multiple
|
||||
variant="outline"
|
||||
size="sm"
|
||||
className="flex w-full min-w-0 flex-wrap justify-start"
|
||||
value={active}
|
||||
aria-label="Тип пробы"
|
||||
onValueChange={(next) => {
|
||||
const values = next.filter((value): value is HealthProvider =>
|
||||
visible.some((item) => item.id === value),
|
||||
)
|
||||
if (values.length === 0) return
|
||||
onChange(values)
|
||||
}}
|
||||
>
|
||||
{visible.map((item) => (
|
||||
<ToggleGroupItem
|
||||
key={item.id}
|
||||
value={item.id}
|
||||
aria-label={item.title}
|
||||
title={item.title}
|
||||
className="max-w-full min-w-0 flex-none justify-start gap-1.5 @[16rem]:min-w-[8.5rem]"
|
||||
>
|
||||
{item.icon}
|
||||
</IconTile>
|
||||
<span className="truncate">{item.title}</span>
|
||||
<HealthCheckBadge
|
||||
status={statuses[item.id] ?? 'unknown'}
|
||||
provider={item.id}
|
||||
size="xs"
|
||||
/>
|
||||
</ToggleGroupItem>
|
||||
))}
|
||||
</ToggleGroup>
|
||||
<IconTile
|
||||
variant="elevated"
|
||||
size="xs"
|
||||
className={item.iconClassName}
|
||||
aria-hidden="true"
|
||||
>
|
||||
{item.icon}
|
||||
</IconTile>
|
||||
<span className="hidden min-w-0 truncate @[16rem]:inline">
|
||||
{item.title}
|
||||
</span>
|
||||
<HealthCheckBadge
|
||||
status={statuses[item.id] ?? 'unknown'}
|
||||
provider={item.id}
|
||||
size="xs"
|
||||
/>
|
||||
</ToggleGroupItem>
|
||||
))}
|
||||
</ToggleGroup>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ function resolveFooter(item: KpiStatItem): ReactNode {
|
||||
if (item.footer) return item.footer
|
||||
if (typeof item.hint === 'string') {
|
||||
return (
|
||||
<Badge variant="outline" size="sm">
|
||||
<Badge variant="outline" size="sm" className="max-w-[min(100%,11rem)] truncate">
|
||||
{item.hint}
|
||||
</Badge>
|
||||
)
|
||||
@@ -81,30 +81,39 @@ function KpiStatCardBody({ item }: { item: KpiStatItem }) {
|
||||
const valueVariant = item.variant ?? 'default'
|
||||
|
||||
return (
|
||||
<div className="relative z-10 flex h-full items-start gap-3">
|
||||
<div className="@container relative z-10 flex h-full min-w-0 items-start gap-3">
|
||||
{item.icon ? (
|
||||
<IconTile
|
||||
variant="elevated"
|
||||
aria-hidden="true"
|
||||
className={cn('size-10.5', item.iconClassName ?? DEFAULT_ICON_CLASS)}
|
||||
className={cn('size-10.5 shrink-0', item.iconClassName ?? DEFAULT_ICON_CLASS)}
|
||||
>
|
||||
{item.icon}
|
||||
</IconTile>
|
||||
) : null}
|
||||
|
||||
<div className="flex min-w-0 flex-1 flex-col gap-0.5">
|
||||
<div className="flex items-start justify-between gap-2">
|
||||
<div className="text-muted-foreground text-sm font-medium">{item.label}</div>
|
||||
{footer ? <div className="shrink-0">{footer}</div> : null}
|
||||
<div className="flex min-w-0 items-start justify-between gap-2">
|
||||
<div className="text-muted-foreground min-w-0 truncate text-sm font-medium">
|
||||
{item.label}
|
||||
</div>
|
||||
{footer ? (
|
||||
<div className="hidden min-w-0 max-w-[min(100%,11rem)] shrink-0 @[20rem]:block">
|
||||
{footer}
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
<div
|
||||
className={cn(
|
||||
'text-2xl leading-none font-bold tabular-nums',
|
||||
'min-w-0 break-all text-2xl leading-none font-bold tabular-nums',
|
||||
VALUE_VARIANT_CLASS[valueVariant],
|
||||
)}
|
||||
>
|
||||
{item.value}
|
||||
</div>
|
||||
{footer ? (
|
||||
<div className="min-w-0 max-w-full @[20rem]:hidden">{footer}</div>
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
@@ -116,7 +125,7 @@ function panelClassName(item: KpiStatItem, className?: string) {
|
||||
const selected = isSelected(item)
|
||||
|
||||
return cn(
|
||||
'relative isolate flex h-full flex-col',
|
||||
'relative isolate flex h-full min-w-0 flex-col',
|
||||
clickable &&
|
||||
'hover:bg-muted/40 focus-within:ring-ring cursor-pointer transition-colors focus-within:ring-2',
|
||||
selected && 'ring-primary/30 bg-muted/30 ring-1',
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import { toAlignedSeries, type UptimeProbe } from './uptime-chart'
|
||||
|
||||
function probe(
|
||||
overrides: Partial<UptimeProbe> & Pick<UptimeProbe, 'id'>,
|
||||
): UptimeProbe {
|
||||
return {
|
||||
status: 'up',
|
||||
ok: true,
|
||||
latency_ms: 10,
|
||||
checked_at: '2026-01-01T00:00:00.000Z',
|
||||
provider: 'local',
|
||||
...overrides,
|
||||
}
|
||||
}
|
||||
|
||||
describe('toAlignedSeries', () => {
|
||||
it('puts mixed-source probes in one 60s bucket instead of a sawtooth series', () => {
|
||||
const { points, keys } = toAlignedSeries([
|
||||
probe({
|
||||
id: 1,
|
||||
provider: 'local',
|
||||
latency_ms: 4,
|
||||
checked_at: '2026-01-01T00:00:10.000Z',
|
||||
}),
|
||||
probe({
|
||||
id: 2,
|
||||
provider: 'cloudflare',
|
||||
latency_ms: 284,
|
||||
checked_at: '2026-01-01T00:00:12.000Z',
|
||||
}),
|
||||
probe({
|
||||
id: 3,
|
||||
provider: 'globalping',
|
||||
latency_ms: 38,
|
||||
checked_at: '2026-01-01T00:00:40.000Z',
|
||||
}),
|
||||
])
|
||||
|
||||
expect(points).toHaveLength(1)
|
||||
expect(points[0]?.local).toBe(4)
|
||||
expect(points[0]?.cloudflare).toBe(284)
|
||||
expect(points[0]?.globalping).toBe(38)
|
||||
expect(keys).toEqual(['local', 'cloudflare', 'globalping'])
|
||||
})
|
||||
|
||||
it('does not plot down probes as latency 0', () => {
|
||||
const { points } = toAlignedSeries([
|
||||
probe({
|
||||
id: 1,
|
||||
status: 'down',
|
||||
ok: false,
|
||||
latency_ms: 12,
|
||||
provider: 'local',
|
||||
}),
|
||||
])
|
||||
|
||||
expect(points).toHaveLength(1)
|
||||
expect(points[0]?.local).toBeNull()
|
||||
expect(points[0]?.localOk).toBe(false)
|
||||
expect(points[0]?.ok).toBe(false)
|
||||
})
|
||||
|
||||
it('splits probes that fall into adjacent minutes', () => {
|
||||
const { points } = toAlignedSeries([
|
||||
probe({ id: 1, latency_ms: 10, checked_at: '2026-01-01T00:00:50.000Z' }),
|
||||
probe({ id: 2, latency_ms: 20, checked_at: '2026-01-01T00:01:10.000Z' }),
|
||||
])
|
||||
|
||||
expect(points).toHaveLength(2)
|
||||
expect(points[0]?.local).toBe(10)
|
||||
expect(points[1]?.local).toBe(20)
|
||||
})
|
||||
})
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useId, useMemo, useState } from 'react'
|
||||
import { useId, useMemo, useState } from 'react'
|
||||
import { ActivityIcon, InfoIcon, TrendingDownIcon, TrendingUpIcon } from 'lucide-react'
|
||||
import { Area, AreaChart, XAxis } from 'recharts'
|
||||
import { Area, ComposedChart, Line, XAxis } from 'recharts'
|
||||
|
||||
import { EmptyState } from '@/components/empty-state'
|
||||
import { Badge } from '@/components/reui/badge'
|
||||
@@ -22,12 +22,13 @@ import {
|
||||
TooltipProvider,
|
||||
TooltipTrigger,
|
||||
} from '@cfdm/ui/components/tooltip'
|
||||
import type { HealthCheckProvider } from '@cfdm/shared'
|
||||
|
||||
/**
|
||||
* Uptime monitoring card — chart-17 DNA (Frame + value + AreaChart + period tabs).
|
||||
* Preview: https://reui.io/preview/base/chart-17
|
||||
* Frame: https://reui.io/docs/components/base/frame
|
||||
* Chart: shadcn Chart + Recharts AreaChart
|
||||
* Chart: shadcn Chart + Recharts ComposedChart
|
||||
*/
|
||||
|
||||
export interface UptimeProbe {
|
||||
@@ -36,6 +37,7 @@ export interface UptimeProbe {
|
||||
ok: boolean
|
||||
latency_ms: number | null
|
||||
checked_at: string
|
||||
provider?: HealthCheckProvider
|
||||
}
|
||||
|
||||
export type UptimePeriodKey = '5D' | '2W' | '1M'
|
||||
@@ -46,40 +48,107 @@ export const UPTIME_PERIODS: { key: UptimePeriodKey; label: string; days: number
|
||||
{ key: '1M', label: '1M', days: 30 },
|
||||
]
|
||||
|
||||
export const UPTIME_BUCKET_MS = 60_000
|
||||
|
||||
export const UPTIME_PROVIDER_KEYS = ['local', 'cloudflare', 'globalping'] as const
|
||||
|
||||
export type UptimeProviderKey = (typeof UPTIME_PROVIDER_KEYS)[number]
|
||||
|
||||
const chartConfig = {
|
||||
latency: {
|
||||
label: 'Задержка',
|
||||
color: 'var(--chart-1)',
|
||||
local: {
|
||||
label: 'Local',
|
||||
color: 'var(--info)',
|
||||
},
|
||||
cloudflare: {
|
||||
label: 'Cloudflare',
|
||||
color: 'var(--warning)',
|
||||
},
|
||||
globalping: {
|
||||
label: 'Globalping',
|
||||
color: 'var(--success)',
|
||||
},
|
||||
} satisfies ChartConfig
|
||||
|
||||
interface ChartPoint {
|
||||
export interface AlignedChartPoint {
|
||||
period: string
|
||||
latency: number
|
||||
ok: boolean
|
||||
at: string
|
||||
status: UptimeProbe['status']
|
||||
ok: boolean
|
||||
local?: number | null
|
||||
cloudflare?: number | null
|
||||
globalping?: number | null
|
||||
localOk?: boolean
|
||||
cloudflareOk?: boolean
|
||||
globalpingOk?: boolean
|
||||
}
|
||||
|
||||
function toSeries(items: UptimeProbe[]): ChartPoint[] {
|
||||
return [...items]
|
||||
.sort((a, b) => probeTime(a.checked_at) - probeTime(b.checked_at))
|
||||
.map((item) => ({
|
||||
period: formatDate(item.checked_at),
|
||||
latency: item.latency_ms ?? 0,
|
||||
ok: item.ok && item.status !== 'down',
|
||||
at: item.checked_at,
|
||||
status: item.status,
|
||||
}))
|
||||
function isProviderKey(value: string | undefined): value is UptimeProviderKey {
|
||||
return value === 'local' || value === 'cloudflare' || value === 'globalping'
|
||||
}
|
||||
|
||||
function uptimePercent(points: ChartPoint[]): number | null {
|
||||
function bucketStart(time: number): number {
|
||||
return Math.floor(time / UPTIME_BUCKET_MS) * UPTIME_BUCKET_MS
|
||||
}
|
||||
|
||||
function providerOf(item: UptimeProbe): UptimeProviderKey {
|
||||
return isProviderKey(item.provider) ? item.provider : 'local'
|
||||
}
|
||||
|
||||
function probeOk(item: UptimeProbe): boolean {
|
||||
return item.ok && item.status !== 'down'
|
||||
}
|
||||
|
||||
/** Align mixed-source probes onto a 60s time axis so Local/CF/GP do not zigzag. */
|
||||
export function toAlignedSeries(items: UptimeProbe[]): {
|
||||
points: AlignedChartPoint[]
|
||||
keys: UptimeProviderKey[]
|
||||
} {
|
||||
const buckets = new Map<number, AlignedChartPoint>()
|
||||
const used = new Set<UptimeProviderKey>()
|
||||
|
||||
const sorted = [...items].sort(
|
||||
(a, b) => probeTime(a.checked_at) - probeTime(b.checked_at) || a.id - b.id,
|
||||
)
|
||||
|
||||
for (const item of sorted) {
|
||||
const key = providerOf(item)
|
||||
used.add(key)
|
||||
const start = bucketStart(probeTime(item.checked_at))
|
||||
let row = buckets.get(start)
|
||||
if (!row) {
|
||||
row = {
|
||||
period: formatDate(item.checked_at),
|
||||
at: item.checked_at,
|
||||
ok: true,
|
||||
}
|
||||
buckets.set(start, row)
|
||||
}
|
||||
|
||||
const ok = probeOk(item)
|
||||
row[`${key}Ok`] = ok
|
||||
row[key] = ok ? item.latency_ms : null
|
||||
}
|
||||
|
||||
const points = [...buckets.entries()]
|
||||
.sort((a, b) => a[0] - b[0])
|
||||
.map(([, row]) => {
|
||||
const present = UPTIME_PROVIDER_KEYS.filter((key) => row[`${key}Ok`] !== undefined)
|
||||
return {
|
||||
...row,
|
||||
ok: present.length === 0 ? row.ok : present.every((key) => row[`${key}Ok`] !== false),
|
||||
}
|
||||
})
|
||||
|
||||
const keys = UPTIME_PROVIDER_KEYS.filter((key) => used.has(key))
|
||||
return { points, keys }
|
||||
}
|
||||
|
||||
function uptimePercent(points: AlignedChartPoint[]): number | null {
|
||||
if (points.length === 0) return null
|
||||
const okCount = points.filter((point) => point.ok).length
|
||||
return (okCount / points.length) * 100
|
||||
}
|
||||
|
||||
function deltaPercent(points: ChartPoint[]): number | null {
|
||||
function deltaPercent(points: AlignedChartPoint[]): number | null {
|
||||
if (points.length < 4) return null
|
||||
const mid = Math.floor(points.length / 2)
|
||||
const prev = uptimePercent(points.slice(0, mid))
|
||||
@@ -113,7 +182,7 @@ function UptimeDelta({ delta }: { delta: number }) {
|
||||
}
|
||||
|
||||
export function probeUptimePercent(items: UptimeProbe[]): number | null {
|
||||
return uptimePercent(toSeries(items))
|
||||
return uptimePercent(toAlignedSeries(items).points)
|
||||
}
|
||||
|
||||
export function lastProbeLatency(items: UptimeProbe[]): number | null {
|
||||
@@ -129,6 +198,12 @@ function formatUptime(value: number | null): string {
|
||||
return `${value.toFixed(value >= 99.95 ? 2 : 1)}%`
|
||||
}
|
||||
|
||||
function formatPing(value: unknown, ok: boolean | undefined): string {
|
||||
if (ok === false) return '—'
|
||||
const ping = typeof value === 'number' ? value : Number(value)
|
||||
return Number.isFinite(ping) ? `${ping} мс` : '—'
|
||||
}
|
||||
|
||||
interface UptimeChartProps {
|
||||
items: UptimeProbe[]
|
||||
isLoading?: boolean
|
||||
@@ -151,27 +226,26 @@ export function UptimeChart({
|
||||
}: UptimeChartProps) {
|
||||
const gradientId = useId().replace(/:/g, '')
|
||||
const [internalPeriod, setInternalPeriod] = useState<UptimePeriodKey>('5D')
|
||||
const [tooltipPortal, setTooltipPortal] = useState<HTMLElement | null>(null)
|
||||
const [pinnedIndex, setPinnedIndex] = useState<number | undefined>()
|
||||
const period = periodProp ?? internalPeriod
|
||||
const days = UPTIME_PERIODS.find((entry) => entry.key === period)?.days ?? 5
|
||||
|
||||
useEffect(() => {
|
||||
setTooltipPortal(document.body)
|
||||
}, [])
|
||||
|
||||
function handlePeriodChange(next: UptimePeriodKey) {
|
||||
onPeriodChange?.(next)
|
||||
if (periodProp == null) setInternalPeriod(next)
|
||||
setPinnedIndex(undefined)
|
||||
}
|
||||
|
||||
const points = useMemo(
|
||||
() => toSeries(skipPeriodFilter ? items : filterByPeriod(items, days)),
|
||||
const { points, keys } = useMemo(
|
||||
() => toAlignedSeries(skipPeriodFilter ? items : filterByPeriod(items, days)),
|
||||
[items, days, skipPeriodFilter],
|
||||
)
|
||||
const uptime = uptimePercent(points)
|
||||
const delta = deltaPercent(points)
|
||||
const lastOk = points.at(-1)?.ok ?? true
|
||||
const tileClass = lastOk ? 'text-success' : 'text-destructive'
|
||||
const single = keys.length <= 1
|
||||
const areaKey = keys[0] ?? 'local'
|
||||
|
||||
const panel = (
|
||||
<FramePanel className="flex flex-col gap-6">
|
||||
@@ -248,42 +322,60 @@ export function UptimeChart({
|
||||
className="h-full w-full overflow-visible rounded-b-xl"
|
||||
initialDimension={{ width: 320, height: 160 }}
|
||||
>
|
||||
<AreaChart
|
||||
<ComposedChart
|
||||
data={points}
|
||||
margin={{ top: 16, left: 8, right: 8, bottom: 4 }}
|
||||
accessibilityLayer
|
||||
onClick={(state) => {
|
||||
const index = state.activeTooltipIndex ?? state.activeIndex
|
||||
if (index == null) return
|
||||
const next = Number(index)
|
||||
if (Number.isFinite(next)) setPinnedIndex(next)
|
||||
}}
|
||||
>
|
||||
<defs>
|
||||
<linearGradient id={gradientId} x1="0" y1="0" x2="0" y2="1">
|
||||
<stop
|
||||
offset="5%"
|
||||
stopColor="var(--color-latency)"
|
||||
stopColor={`var(--color-${areaKey})`}
|
||||
stopOpacity={0.8}
|
||||
/>
|
||||
<stop
|
||||
offset="95%"
|
||||
stopColor="var(--color-latency)"
|
||||
stopColor={`var(--color-${areaKey})`}
|
||||
stopOpacity={0.1}
|
||||
/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<XAxis dataKey="period" hide />
|
||||
<ChartTooltip
|
||||
key={pinnedIndex ?? 'hover'}
|
||||
cursor={{ stroke: 'var(--border)', strokeDasharray: '4 4' }}
|
||||
allowEscapeViewBox={{ x: true, y: true }}
|
||||
portal={tooltipPortal ?? undefined}
|
||||
filterNull={false}
|
||||
defaultIndex={pinnedIndex}
|
||||
active={pinnedIndex != null ? true : undefined}
|
||||
wrapperStyle={{ zIndex: 50, pointerEvents: 'none' }}
|
||||
content={
|
||||
<ChartTooltipContent
|
||||
formatter={(value, _name, item) => {
|
||||
const point = item.payload as ChartPoint | undefined
|
||||
const ping = Number(value)
|
||||
labelFormatter={(_label, payload) => {
|
||||
const at = (payload?.[0]?.payload as AlignedChartPoint | undefined)?.at
|
||||
return at ? formatDate(at) : String(_label ?? '')
|
||||
}}
|
||||
formatter={(value, name, item) => {
|
||||
const key = String(name)
|
||||
const row = item.payload as AlignedChartPoint | undefined
|
||||
const ok =
|
||||
key === 'local' || key === 'cloudflare' || key === 'globalping'
|
||||
? row?.[`${key}Ok`]
|
||||
: row?.ok
|
||||
const label = chartConfig[key as UptimeProviderKey]?.label ?? key
|
||||
return (
|
||||
<div className="flex flex-1 items-center justify-between gap-4">
|
||||
<span className="text-muted-foreground">
|
||||
{point?.ok === false ? 'Down' : 'Пинг'}
|
||||
{ok === false ? `${label} · Down` : `Пинг · ${label}`}
|
||||
</span>
|
||||
<span className="text-foreground font-mono font-medium tabular-nums">
|
||||
{Number.isFinite(ping) ? `${ping} мс` : '—'}
|
||||
{formatPing(value, ok)}
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
@@ -291,42 +383,43 @@ export function UptimeChart({
|
||||
/>
|
||||
}
|
||||
/>
|
||||
<Area
|
||||
dataKey="latency"
|
||||
name="latency"
|
||||
type="natural"
|
||||
fill={`url(#${gradientId})`}
|
||||
stroke="var(--color-latency)"
|
||||
strokeWidth={2}
|
||||
isAnimationActive={false}
|
||||
dot={(dotProps) => {
|
||||
const { cx, cy, payload, index } = dotProps
|
||||
if (cx == null || cy == null) return <g key={index} />
|
||||
const point = payload as ChartPoint | undefined
|
||||
return (
|
||||
<circle
|
||||
key={index}
|
||||
cx={cx}
|
||||
cy={cy}
|
||||
r={4}
|
||||
fill={
|
||||
point?.ok
|
||||
? 'var(--color-latency)'
|
||||
: 'var(--destructive)'
|
||||
}
|
||||
stroke="var(--background)"
|
||||
strokeWidth={2}
|
||||
pointerEvents="none"
|
||||
/>
|
||||
)
|
||||
}}
|
||||
activeDot={{
|
||||
r: 6,
|
||||
stroke: 'var(--background)',
|
||||
strokeWidth: 2,
|
||||
}}
|
||||
/>
|
||||
</AreaChart>
|
||||
{single ? (
|
||||
<Area
|
||||
dataKey={areaKey}
|
||||
name={areaKey}
|
||||
type="monotone"
|
||||
fill={`url(#${gradientId})`}
|
||||
stroke={`var(--color-${areaKey})`}
|
||||
strokeWidth={2}
|
||||
connectNulls={false}
|
||||
isAnimationActive={false}
|
||||
activeDot={{
|
||||
r: 6,
|
||||
stroke: 'var(--background)',
|
||||
strokeWidth: 2,
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
keys.map((key) => (
|
||||
<Line
|
||||
key={key}
|
||||
dataKey={key}
|
||||
name={key}
|
||||
type="monotone"
|
||||
stroke={`var(--color-${key})`}
|
||||
strokeWidth={2}
|
||||
connectNulls={false}
|
||||
isAnimationActive={false}
|
||||
dot={{ r: 3, strokeWidth: 1, stroke: 'var(--background)' }}
|
||||
activeDot={{
|
||||
r: 6,
|
||||
stroke: 'var(--background)',
|
||||
strokeWidth: 2,
|
||||
}}
|
||||
/>
|
||||
))
|
||||
)}
|
||||
</ComposedChart>
|
||||
</ChartContainer>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import { dedupeBreadcrumbs, getBreadcrumbs } from './breadcrumbs'
|
||||
|
||||
describe('getBreadcrumbs', () => {
|
||||
it('keeps a single Настройки parent plus the active section', () => {
|
||||
expect(getBreadcrumbs('/settings/appearance')).toEqual([
|
||||
{ label: 'Настройки', href: '/settings' },
|
||||
{ label: 'Внешний вид', href: '/settings/appearance' },
|
||||
])
|
||||
expect(getBreadcrumbs('/settings/health')).toEqual([
|
||||
{ label: 'Настройки', href: '/settings' },
|
||||
{ label: 'Health-check', href: '/settings/health' },
|
||||
])
|
||||
expect(getBreadcrumbs('/settings/integrations')).toEqual([
|
||||
{ label: 'Настройки', href: '/settings' },
|
||||
{ label: 'Интеграции', href: '/settings/integrations' },
|
||||
])
|
||||
})
|
||||
|
||||
it('does not reuse the section href for the parent crumb', () => {
|
||||
const crumbs = getBreadcrumbs('/settings/appearance')
|
||||
const hrefs = crumbs.map((crumb) => crumb.href)
|
||||
expect(new Set(hrefs).size).toBe(hrefs.length)
|
||||
})
|
||||
})
|
||||
|
||||
describe('dedupeBreadcrumbs', () => {
|
||||
it('collapses stacked identical labels from repeated navigations', () => {
|
||||
expect(
|
||||
dedupeBreadcrumbs([
|
||||
{ label: 'Настройки', href: '/settings' },
|
||||
{ label: 'Настройки', href: '/settings' },
|
||||
{ label: 'Настройки', href: '/settings/appearance' },
|
||||
{ label: 'Внешний вид', href: '/settings/appearance' },
|
||||
]),
|
||||
).toEqual([
|
||||
{ label: 'Настройки', href: '/settings' },
|
||||
{ label: 'Внешний вид', href: '/settings/appearance' },
|
||||
])
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,86 @@
|
||||
export interface BreadcrumbCrumb {
|
||||
label: string
|
||||
href: string
|
||||
}
|
||||
|
||||
const routeTitles: Record<string, string> = {
|
||||
'/': 'Панель управления',
|
||||
'/domains': 'Домены',
|
||||
'/groups': 'Группы доменов',
|
||||
'/services': 'Сервисы',
|
||||
'/certificates': 'Сертификаты',
|
||||
}
|
||||
|
||||
const SETTINGS_SECTIONS: Record<string, string> = {
|
||||
'/settings/appearance': 'Внешний вид',
|
||||
'/settings/health': 'Health-check',
|
||||
'/settings/integrations': 'Интеграции',
|
||||
}
|
||||
|
||||
/** Drop consecutive repeats so «Настройки» does not stack after tab switches. */
|
||||
export function dedupeBreadcrumbs(crumbs: BreadcrumbCrumb[]): BreadcrumbCrumb[] {
|
||||
const out: BreadcrumbCrumb[] = []
|
||||
for (const crumb of crumbs) {
|
||||
const prev = out.at(-1)
|
||||
if (prev && prev.label === crumb.label) continue
|
||||
out.push(crumb)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
export function getBreadcrumbs(
|
||||
pathname: string,
|
||||
dynamicLabels: Record<string, string> = {},
|
||||
): BreadcrumbCrumb[] {
|
||||
const path = pathname.replace(/\/+$/, '') || '/'
|
||||
|
||||
if (path === '/') {
|
||||
return [{ label: 'Панель управления', href: '/' }]
|
||||
}
|
||||
|
||||
if (path.match(/^\/services\/\d+$/)) {
|
||||
return [
|
||||
{ label: 'Сервисы', href: '/services' },
|
||||
{ label: dynamicLabels[path] ?? 'Сервис', href: path },
|
||||
]
|
||||
}
|
||||
|
||||
if (path.match(/^\/groups\/\d+$/)) {
|
||||
return [
|
||||
{ label: 'Группы доменов', href: '/groups' },
|
||||
{ label: dynamicLabels[path] ?? 'Группа', href: path },
|
||||
]
|
||||
}
|
||||
|
||||
if (path.match(/^\/domains\/\d+\/dns$/)) {
|
||||
const domainId = path.split('/')[2]
|
||||
const domainPath = `/domains/${domainId}`
|
||||
return [
|
||||
{ label: 'Домены', href: '/domains' },
|
||||
{ label: dynamicLabels[domainPath] ?? 'Домен', href: domainPath },
|
||||
{ label: 'DNS', href: path },
|
||||
]
|
||||
}
|
||||
|
||||
if (path.match(/^\/domains\/\d+$/)) {
|
||||
return [
|
||||
{ label: 'Домены', href: '/domains' },
|
||||
{ label: dynamicLabels[path] ?? 'Обзор домена', href: path },
|
||||
]
|
||||
}
|
||||
|
||||
if (path === '/settings' || path.startsWith('/settings/')) {
|
||||
const section = SETTINGS_SECTIONS[path]
|
||||
return dedupeBreadcrumbs([
|
||||
{ label: 'Настройки', href: '/settings' },
|
||||
...(section ? [{ label: section, href: path }] : []),
|
||||
])
|
||||
}
|
||||
|
||||
const title = routeTitles[path]
|
||||
if (title) {
|
||||
return [{ label: title, href: path }]
|
||||
}
|
||||
|
||||
return [{ label: 'Панель управления', href: '/' }]
|
||||
}
|
||||
Reference in New Issue
Block a user