Add small trend lines to the rows of the server, endpoint and integration lists
Server cards show load and memory over the last 24 hours, endpoint checks show their answer times with a tick where a check failed, and integrations that keep a figure history show their headline figure over the last week. Each list asks for all its lines in one request, drawn from the history already kept, and each line has a sentence for screen readers. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
5750350565
commit
639408c0d0
15 files changed
+707
No files matched your search
@@ -1,3 +1,4 @@
|
||||
import { } from "../i18n";
|
||||
export type UserRole = "admin" | "operator" | "viewer";
|
||||
|
||||
export interface CurrentUser {
|
||||
@@ -864,6 +865,23 @@ export interface IntegrationFigure {
|
||||
high: number | null;
|
||||
}
|
||||
|
||||
/** A short series for a row in a list: `values` is a fixed number of slices, oldest first, null where nothing was read. */
|
||||
export interface SparkSeries {
|
||||
values: (number | null)[];
|
||||
latest: number | null;
|
||||
low: number | null;
|
||||
high: number | null;
|
||||
}
|
||||
export interface EndpointSparkSeries extends SparkSeries {
|
||||
/** In which slices a check failed. */
|
||||
failed: boolean[];
|
||||
}
|
||||
export interface IntegrationSparkSeries extends SparkSeries {
|
||||
key: string;
|
||||
label: string;
|
||||
unit: string;
|
||||
}
|
||||
|
||||
export interface UpdateRun {
|
||||
id: number;
|
||||
serverId: number;
|
||||
@@ -3888,6 +3906,8 @@ export const api = {
|
||||
},
|
||||
endpoints: {
|
||||
list: () => request<{ checks: EndpointCheck[]; servers: { id: number; name: string }[] }>("/api/endpoints"),
|
||||
/** How long each check took to answer over the last day, and when one failed, for the lines in the list. */
|
||||
sparklines: () => request<{ hours: number; checks: Record<number, EndpointSparkSeries> }>("/api/endpoints/sparklines"),
|
||||
create: (data: EndpointInput) => request<{ check: EndpointCheck }>("/api/endpoints", { method: "POST", body: JSON.stringify(data) }),
|
||||
update: (id: number, data: EndpointInput) => request<{ check: EndpointCheck }>(`/api/endpoints/${id}`, { method: "PUT", body: JSON.stringify(data) }),
|
||||
remove: (id: number) => request<void>(`/api/endpoints/${id}`, { method: "DELETE" }),
|
||||
@@ -4292,6 +4312,8 @@ export const api = {
|
||||
},
|
||||
servers: {
|
||||
list: () => request<{ servers: ServerRecord[]; agentLatest: AgentLatest; agentAutoUpdate: boolean }>("/api/servers"),
|
||||
/** The last day's load and memory of each server that reports them, for the lines in the list. */
|
||||
sparklines: () => request<{ hours: number; servers: Record<number, { cpu?: SparkSeries; mem?: SparkSeries }> }>("/api/servers/sparklines"),
|
||||
setAgentAutoUpdate: (autoUpdate: boolean) => request<{ autoUpdate: boolean }>("/api/servers/agent-update", { method: "PUT", body: JSON.stringify({ autoUpdate }) }),
|
||||
create: (data: { name: string; hostname?: string; description?: string; osType?: "linux" | "windows" }) =>
|
||||
request<{ server: ServerRecord; token: string }>("/api/servers", {
|
||||
@@ -4408,6 +4430,8 @@ export const api = {
|
||||
integration: { id: number; type: IntegrationType; name: string; enabled: boolean };
|
||||
config: Record<string, string | boolean>;
|
||||
}>(`/api/integrations/${id}/config`),
|
||||
/** The figure each integration is known for, over the last week, for the lines in a list. */
|
||||
sparklines: () => request<{ days: number; integrations: Record<number, IntegrationSparkSeries> }>("/api/integrations/sparklines"),
|
||||
/** How the figures it reports have moved over the last `days` (a day to a year); `kept` is false for a kind that keeps none. */
|
||||
figures: (id: number, days: number) => request<{ kept: boolean; days: number; figures: IntegrationFigure[] }>(`/api/integrations/${id}/figures?days=${days}`),
|
||||
inspect: (id: number) => request<IntegrationInspection>(`/api/integrations/${id}/inspect`, { method: "POST" }),
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { sparkGeometry, sparkTicks, type SparkOptions } from "../utils/sparkline";
|
||||
|
||||
/**
|
||||
* A small line for a row in a list: which way something is going, not what it is exactly. A gap in the data is a gap in the line, the newest reading is a dot, and a check that failed in a stretch
|
||||
* has a red tick under it. It is a picture with a text for people who cannot see it (`label`); the exact figures are on the page of the thing itself.
|
||||
*/
|
||||
export default function Sparkline({
|
||||
values,
|
||||
failed,
|
||||
label,
|
||||
width = 84,
|
||||
height = 24,
|
||||
tone = "primary",
|
||||
...scale
|
||||
}: {
|
||||
values: (number | null)[];
|
||||
/** Slices in which something failed: a tick under the line. */
|
||||
failed?: boolean[];
|
||||
/** What the picture says, in words. */
|
||||
label: string;
|
||||
width?: number;
|
||||
height?: number;
|
||||
tone?: "primary" | "green" | "orange" | "red" | "secondary";
|
||||
} & SparkOptions) {
|
||||
const g = sparkGeometry(values, width, height, scale);
|
||||
const ticks = failed ? sparkTicks(failed, width) : [];
|
||||
return (
|
||||
<svg className={`sparkline sparkline-${tone}`} style={{ width, height }} width={width} height={height} viewBox={`0 0 ${width} ${height}`} role="img" aria-label={label}>
|
||||
<title>{label}</title>
|
||||
{g.lines.map((d, i) => (
|
||||
<path key={i} d={d} className="sparkline-line" fill="none" strokeWidth="1.5" strokeLinejoin="round" strokeLinecap="round" />
|
||||
))}
|
||||
{g.dots.map((p, i) => (
|
||||
<circle key={i} cx={p.x} cy={p.y} r="1.5" className="sparkline-dot" />
|
||||
))}
|
||||
{g.last && <circle cx={g.last.x} cy={g.last.y} r="2.2" className="sparkline-dot" />}
|
||||
{ticks.map((x, i) => (
|
||||
<line key={i} x1={x} x2={x} y1={height - 5} y2={height - 1} className="sparkline-fail" strokeWidth="1.5" />
|
||||
))}
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
/** Loads the series for a list once, and again every few minutes (a series moves slowly); null until it is there, and for good if it cannot be had — a list without its lines is still a list. */
|
||||
export function useSparklines<T>(load: () => Promise<T>, everyMs = 5 * 60_000): T | null {
|
||||
const [data, setData] = useState<T | null>(null);
|
||||
useEffect(() => {
|
||||
let alive = true;
|
||||
const run = () =>
|
||||
load()
|
||||
.then((res) => alive && setData(res))
|
||||
.catch(() => undefined);
|
||||
void run();
|
||||
const timer = setInterval(run, everyMs);
|
||||
return () => {
|
||||
alive = false;
|
||||
clearInterval(timer);
|
||||
};
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
return data;
|
||||
}
|
||||
@@ -26,6 +26,8 @@ export const sv: Record<string, string> = {
|
||||
"{n} more explained by something that is down": "{n} till förklaras av något som ligger nere",
|
||||
"{n} silenced by maintenance": "{n} tystade av underhåll",
|
||||
"{n} so far": "{n} hittills",
|
||||
"{n} stretch with a failure": "{n} period med ett fel",
|
||||
"{n} stretches with a failure": "{n} perioder med fel",
|
||||
"{n} thing needs attention": "{n} sak behöver uppmärksamhet",
|
||||
"{n} thing of yours wants a look: handed to you, about to run out, or still going": "{n} sak av dig behöver en titt: tilldelad dig, på väg att löpa ut eller pågår fortfarande",
|
||||
"{n} things need attention": "{n} saker behöver uppmärksamhet",
|
||||
@@ -34,9 +36,11 @@ export const sv: Record<string, string> = {
|
||||
"{n} waiting, {security} security": "{n} väntar, {security} säkerhet",
|
||||
"{n} y ago": "för {n} år sedan",
|
||||
"{name} ({time} left)": "{name} ({time} kvar)",
|
||||
"{name}, {period}: {parts}": "{name}, {period}: {parts}",
|
||||
"{names} — see Alerts for what that leaves unchecked": "{names} — se Larm för vad det lämnar okontrollerat",
|
||||
"{names} and {n} more (the last ends in {time})": "{names} och {n} till (det sista slutar om {time})",
|
||||
"{shown} of {total}": "{shown} av {total}",
|
||||
"{value} now": "{value} nu",
|
||||
"← Prev": "← Föregående",
|
||||
"1 hour": "1 timme",
|
||||
"1 year": "1 år",
|
||||
@@ -120,6 +124,7 @@ export const sv: Record<string, string> = {
|
||||
"Also takes down {n} thing: {list}": "Tar också ned {n} sak: {list}",
|
||||
"Also takes down {n} things: {list}": "Tar också ned {n} saker: {list}",
|
||||
"An API token, a certificate or a password — you're warned before it runs out.": "En API-nyckel, ett certifikat eller ett lösenord — du varnas innan det löper ut.",
|
||||
"answer time, last 24 hours": "svarstid, senaste 24 timmarna",
|
||||
"Any status": "Valfri status",
|
||||
"API tokens": "API-nycklar",
|
||||
"App versions": "Appversioner",
|
||||
@@ -137,6 +142,7 @@ export const sv: Record<string, string> = {
|
||||
"Backups": "Säkerhetskopior",
|
||||
"behind": "efter",
|
||||
"Belongs to": "Tillhör",
|
||||
"between {low} and {high}": "mellan {low} och {high}",
|
||||
"Between 5 and 500.": "Mellan 5 och 500.",
|
||||
"Blocking is switched off.": "Blockering är avstängd.",
|
||||
"Bound to localhost only — other machines can't connect, but the port is still taken": "Bunden bara till localhost — andra maskiner kan inte ansluta, men porten är ändå upptagen",
|
||||
@@ -303,10 +309,13 @@ export const sv: Record<string, string> = {
|
||||
"Kind of alert": "Sorts larm",
|
||||
"Kinds of things": "Sorters saker",
|
||||
"Language": "Språk",
|
||||
"last 24 hours": "senaste 24 timmarna",
|
||||
"Last 30 days": "Senaste 30 dagarna",
|
||||
"Last failed": "Senast misslyckad",
|
||||
"Last port": "Sista port",
|
||||
"Last seen": "Senast sedd",
|
||||
"last week": "senaste veckan",
|
||||
"Last week": "Senaste veckan",
|
||||
"Late or failed": "Sena eller misslyckade",
|
||||
"Leave a box empty to follow Settings → Notifications (shown inside the box). Only what you fill in is different for this server.": "Lämna en ruta tom för att följa Inställningar → Notiser (visas i rutan). Bara det du fyller i skiljer sig för den här servern.",
|
||||
"Leave a server alone when it has no updates waiting": "Lämna en server ifred när den inte har några väntande uppdateringar",
|
||||
@@ -335,6 +344,7 @@ export const sv: Record<string, string> = {
|
||||
"Matched to a server": "Kopplad till en server",
|
||||
"Matching settings": "Matchande inställningar",
|
||||
"Media managers": "Mediahanterare",
|
||||
"Memory": "Minne",
|
||||
"Monitoring": "Övervakning",
|
||||
"Most in an hour": "Flest på en timme",
|
||||
"most recent first": "senaste först",
|
||||
@@ -420,6 +430,7 @@ export const sv: Record<string, string> = {
|
||||
"Nothing needs attention right now.": "Inget behöver uppmärksamhet just nu.",
|
||||
"Nothing new": "Inget nytt",
|
||||
"Nothing on your plate": "Inget på din lista",
|
||||
"nothing read": "inget avläst",
|
||||
"Nothing recorded yet. Changes to this server, times it stopped reporting, and its maintenance windows will be listed here.": "Inget antecknat än. Ändringar av servern, tider då den slutade rapportera och dess underhållsfönster listas här.",
|
||||
"Nothing soon": "Inget inom kort",
|
||||
"Nothing to do": "Inget att göra",
|
||||
|
||||
@@ -19,6 +19,8 @@ import EndpointSuggestions from "../components/EndpointSuggestions";
|
||||
import EndpointHistory from "../components/EndpointHistory";
|
||||
import PageIntro from "../components/PageIntro";
|
||||
import { t } from "../i18n";
|
||||
import Sparkline, { useSparklines } from "../components/Sparkline";
|
||||
import { sparkWords } from "../utils/sparkline";
|
||||
|
||||
const KIND_LABELS: Record<EndpointKind, string> = { http: "Web address", tcp: "Port", tls: "Certificate" };
|
||||
const KIND_HINTS: Record<EndpointKind, string> = {
|
||||
@@ -160,6 +162,7 @@ export default function Endpoints({ user }: { user: CurrentUser }) {
|
||||
const isAdmin = user.role === "admin";
|
||||
const canCheck = user.role === "admin" || user.role === "operator";
|
||||
const [checks, setChecks] = useState<EndpointCheck[] | null>(null);
|
||||
const sparks = useSparklines(() => api.endpoints.sparklines());
|
||||
const [servers, setServers] = useState<{ id: number; name: string }[]>([]);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [draft, setDraft] = useState<Draft | null>(null);
|
||||
@@ -540,6 +543,18 @@ export default function Endpoints({ user }: { user: CurrentUser }) {
|
||||
)}
|
||||
{c.lastResponseMs === null ? <span className="text-secondary">—</span> : `${c.lastResponseMs} ms`}
|
||||
{c.stats?.avgMs24h != null && <div className="text-secondary small">avg {c.stats.avgMs24h} ms</div>}
|
||||
{sparks?.checks[c.id] && (
|
||||
<div className="mt-1">
|
||||
<Sparkline
|
||||
values={sparks.checks[c.id].values}
|
||||
failed={sparks.checks[c.id].failed}
|
||||
width={96}
|
||||
height={26}
|
||||
tone={sparks.checks[c.id].failed.some(Boolean) ? "red" : "primary"}
|
||||
label={sparkWords(c.name, t("answer time, last 24 hours"), sparks.checks[c.id].latest, sparks.checks[c.id].low, sparks.checks[c.id].high, (v) => `${Math.round(v)} ms`, sparks.checks[c.id].failed.filter(Boolean).length)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</td>
|
||||
<td className="stack-label" data-label="Uptime">
|
||||
{c.stats?.uptime24h == null ? (
|
||||
|
||||
@@ -23,6 +23,9 @@ import SortableTh from "../components/SortableTh";
|
||||
import PageIntro from "../components/PageIntro";
|
||||
import { BrandTag } from "../components/BrandIcon";
|
||||
import { t } from "../i18n";
|
||||
import Sparkline, { useSparklines } from "../components/Sparkline";
|
||||
import { sparkWords } from "../utils/sparkline";
|
||||
import { formatFigure } from "../utils/figureUnits";
|
||||
|
||||
function HealthBadge({ i }: { i: IntegrationSummary }) {
|
||||
const status = integrationStatus(i);
|
||||
@@ -172,6 +175,21 @@ function IntegrationsList({ user, tabs }: { user: CurrentUser; tabs: ReactNode }
|
||||
const sortedIntegrations = tableSearch.filtered ? [...tableSearch.filtered].filter(matchesStatus).sort((a, b) => a.name.localeCompare(b.name)) : null;
|
||||
|
||||
const rows = sortedIntegrations ? sortedIntegrations.map(integrationRow) : null;
|
||||
// The figure each integration is known for, over the last week (only those that keep a history have one).
|
||||
const sparks = useSparklines(() => api.integrations.sparklines());
|
||||
const trendOf = (id: number) => {
|
||||
const s = sparks?.integrations[id];
|
||||
if (!s) return <span className="text-secondary">—</span>;
|
||||
return (
|
||||
<span className="d-inline-flex align-items-center gap-2">
|
||||
<Sparkline values={s.values} width={72} height={22} label={sparkWords(s.label, t("last week"), s.latest, s.low, s.high, (v) => formatFigure(s.unit, v))} />
|
||||
<span className="small">
|
||||
<span className="text-secondary">{s.label} </span>
|
||||
{s.latest === null ? "—" : formatFigure(s.unit, s.latest)}
|
||||
</span>
|
||||
</span>
|
||||
);
|
||||
};
|
||||
const { sorted: sortedRows, sortKey, sortDir, requestSort } = useSortable<IntegrationRow>(rows, "name", "asc", { url: true });
|
||||
|
||||
// The cards in groups, as the sidebar groups their pages (a kind nobody has placed goes under "Other").
|
||||
@@ -334,6 +352,7 @@ function IntegrationsList({ user, tabs }: { user: CurrentUser; tabs: ReactNode }
|
||||
<SortableTh<IntegrationRow> label="Group" sortKeyName="group" activeKey={sortKey} direction={sortDir} onSort={requestSort} />
|
||||
<SortableTh<IntegrationRow> label="Address" sortKeyName="host" activeKey={sortKey} direction={sortDir} onSort={requestSort} />
|
||||
<SortableTh<IntegrationRow> label={t("Status")} sortKeyName="statusRank" activeKey={sortKey} direction={sortDir} onSort={requestSort} />
|
||||
<th scope="col">{t("Last week")}</th>
|
||||
<th scope="col">{t("Last 30 days")}</th>
|
||||
<th scope="col">{t("Actions")}</th>
|
||||
</tr>
|
||||
@@ -352,6 +371,7 @@ function IntegrationsList({ user, tabs }: { user: CurrentUser; tabs: ReactNode }
|
||||
{testBadge(i)}
|
||||
{testResults[i.id] && !testResults[i.id].ok && testingId !== i.id && <div className="text-red small mt-1">{testResults[i.id].error}</div>}
|
||||
</td>
|
||||
<td>{trendOf(i.id)}</td>
|
||||
<td>{i.enabled ? <UptimeRibbon kind="integrations" id={i.id} name={i.name} /> : <span className="text-secondary">—</span>}</td>
|
||||
<td>
|
||||
<div className="btn-list">{actionsOf(i)}</div>
|
||||
@@ -389,6 +409,7 @@ function IntegrationsList({ user, tabs }: { user: CurrentUser; tabs: ReactNode }
|
||||
<HealthBadge i={i} />
|
||||
{testBadge(i)}
|
||||
</div>
|
||||
{i.enabled && sparks?.integrations[i.id] && <div className="mb-3">{trendOf(i.id)}</div>}
|
||||
{i.enabled && (
|
||||
<div className="mb-3">
|
||||
<UptimeRibbon kind="integrations" id={i.id} name={i.name} />
|
||||
|
||||
@@ -28,12 +28,15 @@ import { RunsOnBulkDrawer, SilenceBulkDrawer, TagBulkDrawer } from "../component
|
||||
import { doBulk, plural } from "../utils/bulk";
|
||||
import { BrandTag } from "../components/BrandIcon";
|
||||
import { t } from "../i18n";
|
||||
import Sparkline, { useSparklines } from "../components/Sparkline";
|
||||
import { sparkWords } from "../utils/sparkline";
|
||||
|
||||
|
||||
export default function Servers({ user }: { user: CurrentUser }) {
|
||||
const isAdmin = user.role === "admin";
|
||||
|
||||
const [servers, setServers] = useState<ServerRecord[]>([]);
|
||||
const sparks = useSparklines(() => api.servers.sparklines());
|
||||
// Until the first answer arrives there is nothing to say about "no servers", so show the page's shape instead of the empty message.
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const [agentLatest, setAgentLatest] = useState<AgentLatest | null>(null);
|
||||
@@ -252,6 +255,22 @@ export default function Servers({ user }: { user: CurrentUser }) {
|
||||
<div className="text-secondary small mt-2">
|
||||
{s.lastSeenAt ? <>{t("Last seen")} <TimeAgo value={s.lastSeenAt} /></> : t("Never reported")}
|
||||
</div>
|
||||
{(sparks?.servers[s.id]?.cpu || sparks?.servers[s.id]?.mem) && (
|
||||
<div className="mt-2 small text-secondary">
|
||||
{([["cpu", t("CPU load")], ["mem", t("Memory")]] as const).map(([metric, name]) => {
|
||||
const line = sparks?.servers[s.id]?.[metric];
|
||||
return line ? (
|
||||
<div key={metric} className="mb-1">
|
||||
<div className="d-flex justify-content-between">
|
||||
{name}
|
||||
<span className="text-body">{line.latest === null ? "—" : `${Math.round(line.latest)}%`}</span>
|
||||
</div>
|
||||
<Sparkline values={line.values} min={0} max={100} width={140} height={22} tone={line.latest !== null && line.latest >= 90 ? "red" : line.latest !== null && line.latest >= 75 ? "orange" : "primary"} label={sparkWords(name, t("last 24 hours"), line.latest, line.low, line.high, (v) => `${Math.round(v)}%`)} />
|
||||
</div>
|
||||
) : null;
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
<div className="mt-2">
|
||||
<UptimeRibbon kind="servers" id={s.id} name={s.name} />
|
||||
</div>
|
||||
|
||||
@@ -301,6 +301,7 @@ html[data-env] .navbar-vertical {
|
||||
}
|
||||
|
||||
.sparkline {
|
||||
display: block;
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 4rem;
|
||||
@@ -2328,3 +2329,28 @@ select,
|
||||
[role="tab"] {
|
||||
touch-action: manipulation;
|
||||
}
|
||||
|
||||
/* ── The small lines in the rows of a list (components/Sparkline) ── */
|
||||
.sparkline {
|
||||
display: block;
|
||||
flex: 0 0 auto;
|
||||
vertical-align: middle;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.sparkline-line {
|
||||
stroke: var(--sparkline-color, var(--tblr-primary));
|
||||
}
|
||||
|
||||
.sparkline-dot {
|
||||
fill: var(--sparkline-color, var(--tblr-primary));
|
||||
}
|
||||
|
||||
.sparkline-fail {
|
||||
stroke: var(--tblr-red);
|
||||
}
|
||||
|
||||
.sparkline-green { --sparkline-color: var(--tblr-green); }
|
||||
.sparkline-orange { --sparkline-color: var(--tblr-orange); }
|
||||
.sparkline-red { --sparkline-color: var(--tblr-red); }
|
||||
.sparkline-secondary { --sparkline-color: var(--tblr-secondary); }
|
||||
@@ -0,0 +1,81 @@
|
||||
import { t, tn } from "../i18n";
|
||||
|
||||
/** The drawing of the small lines in the rows of a list. Pure, so it can be tested without a browser. */
|
||||
|
||||
export interface SparkOptions {
|
||||
/** The scale: both given makes it fixed (a percentage is 0–100 whatever the data), otherwise it fits the data. */
|
||||
min?: number;
|
||||
max?: number;
|
||||
/** Room kept round the drawing, in pixels, so the line and its last dot are not cut off. */
|
||||
pad?: number;
|
||||
}
|
||||
|
||||
export interface SparkGeometry {
|
||||
/** SVG path data, one for each run of readings with no gap in it. */
|
||||
lines: string[];
|
||||
/** A reading with a gap on both sides can't be a line; it is a dot. */
|
||||
dots: { x: number; y: number }[];
|
||||
/** The newest reading. */
|
||||
last: { x: number; y: number } | null;
|
||||
/** The scale used. */
|
||||
min: number;
|
||||
max: number;
|
||||
}
|
||||
|
||||
const r1 = (n: number) => Math.round(n * 10) / 10;
|
||||
|
||||
/**
|
||||
* Turns a series (null where nothing was read) into the lines of a w × h picture: oldest at the left, a gap in the data a gap in the drawing, the scale fixed or fitted. A flat series is drawn
|
||||
* through the middle rather than along an edge.
|
||||
*/
|
||||
export function sparkGeometry(values: (number | null)[], w: number, h: number, options: SparkOptions = {}): SparkGeometry {
|
||||
const pad = options.pad ?? 2;
|
||||
const real = values.filter((v): v is number => v !== null && Number.isFinite(v));
|
||||
let min = options.min ?? (real.length ? Math.min(...real) : 0);
|
||||
let max = options.max ?? (real.length ? Math.max(...real) : 1);
|
||||
if (max - min < 1e-9) {
|
||||
// flat: centre it
|
||||
min -= 1;
|
||||
max += 1;
|
||||
}
|
||||
const n = values.length;
|
||||
const x = (i: number) => r1(pad + (n <= 1 ? (w - 2 * pad) / 2 : (i / (n - 1)) * (w - 2 * pad)));
|
||||
const y = (v: number) => r1(pad + (1 - (Math.min(max, Math.max(min, v)) - min) / (max - min)) * (h - 2 * pad));
|
||||
|
||||
const lines: string[] = [];
|
||||
const dots: { x: number; y: number }[] = [];
|
||||
let run: { x: number; y: number }[] = [];
|
||||
const flush = () => {
|
||||
if (run.length === 1) dots.push(run[0]);
|
||||
else if (run.length > 1) lines.push(run.map((p, i) => `${i === 0 ? "M" : "L"}${p.x} ${p.y}`).join(" "));
|
||||
run = [];
|
||||
};
|
||||
let last: { x: number; y: number } | null = null;
|
||||
values.forEach((v, i) => {
|
||||
if (v === null || !Number.isFinite(v)) return flush();
|
||||
const p = { x: x(i), y: y(v) };
|
||||
run.push(p);
|
||||
last = p;
|
||||
// a null after this value ends the run
|
||||
if (i + 1 >= n || values[i + 1] === null || !Number.isFinite(values[i + 1] as number)) flush();
|
||||
});
|
||||
return { lines, dots, last, min, max };
|
||||
}
|
||||
|
||||
/** The positions (as x in a w-wide picture) of the slices marked, for the ticks under a line (a check that failed). */
|
||||
export function sparkTicks(marked: boolean[], w: number, pad = 2): number[] {
|
||||
const n = marked.length;
|
||||
return marked.flatMap((m, i) => (m ? [r1(pad + (n <= 1 ? (w - 2 * pad) / 2 : (i / (n - 1)) * (w - 2 * pad)))] : []));
|
||||
}
|
||||
|
||||
/** What the picture says, for someone who cannot see it: "CPU load, last 24 hours: 12% now, between 3% and 40%". */
|
||||
export function sparkWords(name: string, period: string, latest: number | null, low: number | null, high: number | null, write: (v: number) => string, failed = 0): string {
|
||||
const parts: string[] = [];
|
||||
if (latest === null) parts.push(t("nothing read"));
|
||||
else {
|
||||
parts.push(t("{value} now", { value: write(latest) }));
|
||||
if (low !== null && high !== null && low !== high) parts.push(t("between {low} and {high}", { low: write(low), high: write(high) }));
|
||||
}
|
||||
if (failed > 0) parts.push(tn(failed, "{n} stretch with a failure", "{n} stretches with a failure"));
|
||||
return t("{name}, {period}: {parts}", { name, period, parts: parts.join(", ") });
|
||||
}
|
||||
Reference in new issue
Block a user