Anonymous visitors to a public status page have no persisted Redux state, so ThemedHeatmap and ThemedHistogram tooltips always rendered timestamps in the hardcoded "America/Toronto" default — regardless of the timezone the operator configured. Even on the same domain, ThemedHeatmap and ThemedHistogram had no code path to consume the operator-configured statusPage.timezone returned by the API. - Add SYSTEM_TIMEZONE module constant and a small resolveTimezone() helper to TimeUtils.ts. formatDateWithTz's timezone parameter is now optional and defaults to the system tz, so callers don't need to rebuild the prop -> browser -> UTC chain inline. - Add a `timezone` field to StatusPageThemeContextValue so any themed component on the public page can read the page-wide tz without prop drilling (parallels how `theme` and `mode` are already exposed). - Wire statusPage.timezone into StatusPageThemeProvider from Pages/StatusPage/Status/index.tsx (both the public route and the admin preview). - ThemedHeatmap and ThemedHistogram now read tz from the context instead of useSelector(state.ui.timezone) — that selector was unreliable for anonymous visitors and removing it cuts a Redux subscription on the public page. - Replace the inline `data?.timezone || Intl.DateTimeFormat()...` expression in useStatusPageForm.ts with resolveTimezone(). Closes #3628.
116 lines
3.1 KiB
TypeScript
116 lines
3.1 KiB
TypeScript
import { useMemo } from "react";
|
|
import Tooltip from "@mui/material/Tooltip";
|
|
import Box from "@mui/material/Box";
|
|
import Stack from "@mui/material/Stack";
|
|
import Typography from "@mui/material/Typography";
|
|
import type { SxProps, Theme } from "@mui/material/styles";
|
|
import { useTranslation } from "react-i18next";
|
|
import type { CheckSnapshot } from "@/Types/Check";
|
|
import { formatDateWithTz } from "@/Utils/TimeUtils";
|
|
import { MAX_RECENT_CHECKS } from "@/Types/Monitor";
|
|
import { useStatusPageTheme } from "../StatusPageThemeProvider";
|
|
const CELLS = MAX_RECENT_CHECKS;
|
|
const MIN_HEIGHT_PCT = 6;
|
|
|
|
export type BarKind = "up" | "down" | "empty";
|
|
|
|
interface Props {
|
|
checks: CheckSnapshot[];
|
|
containerSx: SxProps<Theme>;
|
|
barSx: (kind: BarKind, heightPct: number) => SxProps<Theme>;
|
|
statsSx: SxProps<Theme>;
|
|
statsGap?: number;
|
|
}
|
|
|
|
const tone = (check: CheckSnapshot): Exclude<BarKind, "empty"> =>
|
|
check.status ? "up" : "down";
|
|
|
|
export const ThemedHistogram = ({
|
|
checks,
|
|
containerSx,
|
|
barSx,
|
|
statsSx,
|
|
statsGap = 1,
|
|
}: Props) => {
|
|
const { t } = useTranslation();
|
|
const { timezone } = useStatusPageTheme();
|
|
|
|
const { padded, max, avg, peak } = useMemo(() => {
|
|
const source = checks.slice(-CELLS);
|
|
const out: (CheckSnapshot | null)[] = [
|
|
...source,
|
|
...Array.from({ length: Math.max(0, CELLS - source.length) }, () => null),
|
|
];
|
|
const valid = out.filter((c): c is CheckSnapshot => c !== null && c.responseTime > 0);
|
|
const maxRt = valid.length ? Math.max(...valid.map((c) => c.responseTime)) : 1;
|
|
const avgRt = valid.length
|
|
? Math.round(valid.reduce((s, c) => s + c.responseTime, 0) / valid.length)
|
|
: 0;
|
|
return { padded: out, max: maxRt, avg: avgRt, peak: valid.length ? maxRt : 0 };
|
|
}, [checks]);
|
|
|
|
return (
|
|
<Stack gap={statsGap}>
|
|
<Box sx={containerSx}>
|
|
{padded.map((check, i) => {
|
|
if (!check) {
|
|
return (
|
|
<Box
|
|
key={`empty-${i}`}
|
|
sx={barSx("empty", MIN_HEIGHT_PCT)}
|
|
/>
|
|
);
|
|
}
|
|
const height = Math.max(
|
|
MIN_HEIGHT_PCT,
|
|
Math.round((check.responseTime / max) * 100)
|
|
);
|
|
const tooltipContent = (
|
|
<Stack gap={0.25}>
|
|
<Typography
|
|
variant="caption"
|
|
fontWeight={600}
|
|
>
|
|
{check.status
|
|
? `${check.responseTime} ms`
|
|
: t("pages.statusPages.monitorsList.chart.downTooltip")}
|
|
</Typography>
|
|
<Typography
|
|
variant="caption"
|
|
sx={{ opacity: 0.8 }}
|
|
>
|
|
{formatDateWithTz(
|
|
check.createdAt,
|
|
"ddd, MMMM D, YYYY, HH:mm A",
|
|
timezone
|
|
)}
|
|
</Typography>
|
|
</Stack>
|
|
);
|
|
return (
|
|
<Tooltip
|
|
key={check.id ?? i}
|
|
title={tooltipContent}
|
|
arrow
|
|
placement="top"
|
|
>
|
|
<Box
|
|
sx={barSx(tone(check), height)}
|
|
aria-label={`${check.responseTime} ms`}
|
|
/>
|
|
</Tooltip>
|
|
);
|
|
})}
|
|
</Box>
|
|
<Stack
|
|
direction="row"
|
|
justifyContent="space-between"
|
|
sx={statsSx}
|
|
>
|
|
<span>{t("pages.statusPages.monitorsList.chart.avg", { value: avg })}</span>
|
|
<span>{t("pages.statusPages.monitorsList.chart.max", { value: peak })}</span>
|
|
</Stack>
|
|
</Stack>
|
|
);
|
|
};
|