xtcnet/D3V-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Resolve React Error #31 and missing date rendering in WireGuard Client Logs Modal

Browse source
This commit is contained in:
xtcnet 2026-03-10 19:12:24 +07:00
parent 090894021a
commit 335490ac06
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
frontend/src/modals/WireGuardClientLogsModal.tsx
View file

@ -23,20 +23,34 @@ const WireGuardClientLogsModal = EasyModal.create(({ clientId, clientName }: Pro
modal.hide(); modal.hide();
}; };
const formatDate = (dateString: string) => { const formatDate = (dateValue: string | number | undefined) => {
if (!dateValue) return "Unknown Date";
try { try {
// Ensure UTC parsing from raw SQLite timestamp const dateString = String(dateValue);
const d = new Date(dateString.endsWith('Z') ? dateString : dateString + 'Z'); let d: Date;
// If it's pure numbers, it might be an epoch timestamp (ms)
if (/^\d+$/.test(dateString) && Number(dateString) > 1000000000) {
d = new Date(Number(dateString));
} else if (dateString.includes("-") && !dateString.endsWith("Z")) {
// Ensure UTC parsing from raw SQLite timestamp
d = new Date(dateString + "Z");
} else {
d = new Date(dateString);
}
return isNaN(d.getTime()) ? dateString : d.toLocaleString(); return isNaN(d.getTime()) ? dateString : d.toLocaleString();
} catch { } catch {
return dateString; return String(dateValue);
} }
}; };
const parseLogMeta = (metaString: string | any) => { const parseLogMeta = (metaString: string | any) => {
try { try {
const meta = typeof metaString === 'string' ? JSON.parse(metaString) : metaString; const meta = typeof metaString === 'string' ? JSON.parse(metaString) : metaString;
return meta?.message || typeof meta === 'string' ? meta : JSON.stringify(meta); if (meta && typeof meta === 'object') {
// If it's an object with a message, return the message string, else stringify the whole object
return meta.message ? String(meta.message) : JSON.stringify(meta);
}
return typeof meta === 'string' ? meta : JSON.stringify(meta);
} catch { } catch {
return String(metaString); return String(metaString);
} }
@ -85,7 +99,7 @@ const WireGuardClientLogsModal = EasyModal.create(({ clientId, clientName }: Pro
logs.map((log: any) => ( logs.map((log: any) => (
<tr key={log.id}> <tr key={log.id}>
<td className="text-muted small"> <td className="text-muted small">
{formatDate(log.created_on)} {formatDate(log.created_on || log.createdOn)}
</td> </td>
<td>{getActionBadge(log.action)}</td> <td>{getActionBadge(log.action)}</td>
<td className="small text-muted text-wrap"> <td className="small text-muted text-wrap">