Skip to content

[WRONG BRANCH] fix(gui): render dashboard log timestamps in server timezone #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Wibias wants to merge 1 commit into from
Closed

[WRONG BRANCH] fix(gui): render dashboard log timestamps in server timezone #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions gui/src/pages/Logs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,12 @@ function statusColor(status: number): string {
return "var(--amber)";
}

function formatLogTimestamp(ts: number, localeTag?: string): string {
return new Date(ts).toLocaleTimeString(localeTag);
function formatLogTimestamp(ts: number, localeTag?: string, timeZone?: string): string {
return new Date(ts).toLocaleTimeString(localeTag, timeZone ? { timeZone } : undefined);
}

function formatLogDateTime(ts: number, localeTag?: string): string {
return new Date(ts).toLocaleString(localeTag);
function formatLogDateTime(ts: number, localeTag?: string, timeZone?: string): string {
return new Date(ts).toLocaleString(localeTag, timeZone ? { timeZone } : undefined);
}

function modelTitle(log: LogEntry): string {
Expand Down Expand Up @@ -333,6 +333,7 @@ export default function Logs({ apiBase }: { apiBase: string }) {
const { t, locale } = useI18n();
const cachedLogs = readSessionListCache<LogEntry[]>(logsCacheKey(apiBase));
const [logs, setLogs] = useState<LogEntry[]>(() => cachedLogs ?? []);
const [serverTimeZone, setServerTimeZone] = useState<string | undefined>();
const [loading, setLoading] = useState(() => !(cachedLogs && cachedLogs.length > 0));
const [error, setError] = useState<string | null>(null);
const [autoRefresh, setAutoRefresh] = useState(true);
Expand Down Expand Up @@ -370,8 +371,11 @@ export default function Logs({ apiBase }: { apiBase: string }) {
try {
const res = await fetch(`${apiBase}/api/logs?limit=2000`);
if (!res.ok) throw new Error(`${res.status} ${res.statusText}`.trim());
const body = await res.json() as LogEntry[] | { logs?: LogEntry[] };
const body = await res.json() as LogEntry[] | { logs?: LogEntry[]; timeZone?: string };
const next = Array.isArray(body) ? body : (body.logs ?? []);
if (!Array.isArray(body) && typeof body.timeZone === "string" && body.timeZone.trim()) {
setServerTimeZone(body.timeZone.trim());
}
setLogs(next);
writeSessionListCache(logsCacheKey(apiBase), next);
setError(null);
Expand Down Expand Up @@ -592,7 +596,7 @@ export default function Logs({ apiBase }: { apiBase: string }) {
data-index={virtualRow.index}
ref={rowVirtualizer.measureElement}
>
<td className="muted mono">{formatLogTimestamp(log.timestamp, localeTag)}</td>
<td className="muted mono">{formatLogTimestamp(log.timestamp, localeTag, serverTimeZone)}</td>
<td className="num mono log-col-tokens" title={tokensTitle(log, t)}>
{(() => {
const tokenTotal = displayContextTokenTotal(log);
Expand Down Expand Up @@ -679,6 +683,7 @@ export default function Logs({ apiBase }: { apiBase: string }) {
detailInfo={detailInfo}
localeCode={locale}
localeTag={localeTag}
serverTimeZone={serverTimeZone}
t={t}
onClose={() => setDetail(null)}
onFilterConversation={id => {
Expand All @@ -704,12 +709,13 @@ function useModalDialog(open: boolean) {
}

function LogDetailDialog({
detail, detailInfo, localeCode, localeTag, t, onClose, onFilterConversation,
detail, detailInfo, localeCode, localeTag, serverTimeZone, t, onClose, onFilterConversation,
}: {
detail: LogEntry;
detailInfo: ReturnType<typeof statusCodeInfo> | null;
localeCode: string;
localeTag?: string;
serverTimeZone?: string;
t: TFn;
onClose: () => void;
onFilterConversation?: (conversationId: string) => void;
Expand Down Expand Up @@ -751,7 +757,7 @@ function LogDetailDialog({
<section className="log-detail-section" aria-labelledby="log-detail-basic">
<h4 id="log-detail-basic" className="log-detail-section-title">{t("logs.detail.section.basic")}</h4>
<div className="log-detail-grid">
<span className="muted">{t("logs.col.time")}</span><span className="mono">{formatLogDateTime(detail.timestamp, localeTag)}</span>
<span className="muted">{t("logs.col.time")}</span><span className="mono">{formatLogDateTime(detail.timestamp, localeTag, serverTimeZone)}</span>
<span className="muted">{t("logs.col.request")}</span>
<span className="log-detail-request-row">
<span className="mono log-detail-break">{detail.requestId ?? "\u2014"}</span>
Expand Down
1 change: 1 addition & 0 deletions src/server/management/config-routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise<Respon
);
}
return jsonResponse({
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
codexAutoStart: codexAutoStartEnabled(config),
port: config.port,
hostname: config.hostname ?? "127.0.0.1",
Expand Down
Loading