{t("statusPage.form.windowHoursDesc")}
- {t("statusPage.form.aggregationIntervalMinutesDesc")} -
- {labels.inferredFromNeighbors} -
- ) : null} ); diff --git a/src/app/[locale]/status/_components/public-status-view.tsx b/src/app/[locale]/status/_components/public-status-view.tsx index 47d328a71..3936b3962 100644 --- a/src/app/[locale]/status/_components/public-status-view.tsx +++ b/src/app/[locale]/status/_components/public-status-view.tsx @@ -15,6 +15,7 @@ import { sortableKeyboardCoordinates, verticalListSortingStrategy, } from "@dnd-kit/sortable"; +import { Activity } from "lucide-react"; import { startTransition, useEffect, useMemo, useState } from "react"; import { Badge } from "@/components/ui/badge"; import type { PublicStatusPayload } from "@/lib/public-status/payload"; @@ -22,6 +23,7 @@ import { getPublicStatusVendorIconComponent } from "@/lib/public-status/vendor-i import { cn } from "@/lib/utils"; import { type DisplayState, deriveLatestModelState } from "../_lib/derive-display-state"; import { fillDisplayTimeline } from "../_lib/fill-display-timeline"; +import { formatTtfb } from "../_lib/format-ttfb"; import { clearGroupOrder, loadCollapsedSet, @@ -47,6 +49,7 @@ interface PublicStatusViewProps { intervalMinutes: number; rangeHours: number; followServerDefaults?: boolean; + filterSlug?: string; locale: string; siteTitle: string; timeZone: string; @@ -76,8 +79,6 @@ interface PublicStatusViewProps { availability: string; ttfb: string; tps: string; - samples: string; - inferredFromNeighbors: string; historyAriaLabel: string; }; searchPlaceholder: string; @@ -88,6 +89,8 @@ interface PublicStatusViewProps { issuesLabel: string; clearSearch: string; dragHandle: string; + toggleGroup: string; + openGroupPage: string; }; } @@ -119,11 +122,13 @@ function badgeVariant(state: DisplayState): { } } -function aggregateOverallState(states: DisplayState[]): DisplayState { - if (states.some((s) => s === "failed")) return "failed"; - if (states.some((s) => s === "degraded")) return "degraded"; - if (states.some((s) => s === "operational")) return "operational"; - return "no_data"; +function aggregateByFailed(states: DisplayState[]): DisplayState { + const effective = states.filter((s) => s !== "no_data"); + if (effective.length === 0) return "no_data"; + const failedCount = effective.filter((s) => s === "failed").length; + if (failedCount === effective.length) return "failed"; + if (failedCount >= 1) return "degraded"; + return "operational"; } export function PublicStatusView({ @@ -131,6 +136,7 @@ export function PublicStatusView({ intervalMinutes, rangeHours, followServerDefaults = false, + filterSlug, locale, siteTitle, timeZone, @@ -154,7 +160,11 @@ export function PublicStatusView({ ); if (!response.ok) return; const next = (await response.json()) as PublicStatusPayload; - startTransition(() => setPayload(next)); + // 单分组页面(/status/[slug]):每次轮询后仍只保留目标分组,避免刷新后展开成全站视图 + const scoped = filterSlug + ? { ...next, groups: next.groups.filter((g) => g.publicGroupSlug === filterSlug) } + : next; + startTransition(() => setPayload(scoped)); } catch { // keep last payload until next tick } @@ -164,7 +174,7 @@ export function PublicStatusView({ } const pollId = window.setInterval(() => void refresh(), 30_000); return () => window.clearInterval(pollId); - }, [followServerDefaults, initialPayload.rebuildState, intervalMinutes, rangeHours]); + }, [followServerDefaults, initialPayload.rebuildState, intervalMinutes, rangeHours, filterSlug]); useEffect(() => { setGroupOrder(loadGroupOrder()); @@ -172,20 +182,7 @@ export function PublicStatusView({ setOrderHydrated(true); }, []); - const baseGroups = useMemo( - () => - payload.groups.length > 0 - ? payload.groups - : [ - { - publicGroupSlug: "bootstrap", - displayName: labels.systemStatus, - explanatoryCopy: labels.emptyDescription, - models: [], - }, - ], - [payload.groups, labels.systemStatus, labels.emptyDescription] - ); + const baseGroups = useMemo(() => payload.groups, [payload.groups]); const derivedGroups = useMemo(() => { return baseGroups.map((group) => { @@ -197,10 +194,9 @@ export function PublicStatusView({ const latest = deriveLatestModelState(model); return { model, chartCells, uptime24h, ttfb24h, latest }; }); - const issueCount = derivedModels.filter( - (d) => d.latest === "failed" || d.latest === "degraded" - ).length; - return { group, derivedModels, issueCount }; + const issueCount = derivedModels.filter((d) => d.latest === "failed").length; + const groupState = aggregateByFailed(derivedModels.map((d) => d.latest)); + return { group, derivedModels, issueCount, groupState }; }); }, [baseGroups]); @@ -235,8 +231,7 @@ export function PublicStatusView({ }, [orderedGroups, searchQuery, isFiltering]); const overallState: DisplayState = useMemo(() => { - const states = derivedGroups.flatMap((g) => g.derivedModels.map((d) => d.latest)); - return aggregateOverallState(states); + return aggregateByFailed(derivedGroups.map((g) => g.groupState)); }, [derivedGroups]); const overallLabel = badgeVariant(overallState).label(labels); @@ -287,12 +282,18 @@ export function PublicStatusView({ availability: labels.tooltip.availability, ttfb: labels.tooltip.ttfb, tps: labels.tooltip.tps, - samples: labels.tooltip.samples, - inferredFromNeighbors: labels.tooltip.inferredFromNeighbors, noData: labels.noData, historyAriaLabel: labels.tooltip.historyAriaLabel, }; + if (payload.groups.length === 0) { + return ( +{explanatoryCopy}
+ ) : null}