Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(dashboard): show hours for recent session activity
Yudhi Armyndharis75db5cd9e3e0
diff --git a/dashboard/src/pages/Dashboard.tsx b/dashboard/src/pages/Dashboard.tsxindex c546f4d5c..88f6d2873 100644--- a/dashboard/src/pages/Dashboard.tsx+++ b/dashboard/src/pages/Dashboard.tsx@@ -16,6 +16,7 @@ import {import { PageHeader } from '../components/PageHeader';import { isSessionStarted } from '../utils/sessionActions';import './Dashboard.css';+import { formatLastActive, formatSessionStatus } from '../utils/sessionDisplay';// recharts is heavy (~116 kB gzip); load the analytics section on demand so it never bloats the// main/login bundle, and only for an unscoped admin key: /stats/messages refuses every other key.@@ -80,17 +81,6 @@ export function Dashboard() {{ label: t('dashboard.stats.totalMessages'), value: totalMessages, icon: Activity },];- const formatLastActive = (date?: string | null) => {- if (!date) return t('common.never');- const diff = Date.now() - new Date(date).getTime();- if (diff < 60000) return t('common.justNow');- if (diff < 3600000) return t('common.minAgo', { count: Math.floor(diff / 60000) });- if (diff < 86400000) return t('common.hoursAgo', { count: Math.floor(diff / 3600000) });- return new Date(date).toLocaleDateString();- };-- const formatStatus = (status: string) => t(`sessionStatus.${status}`, { defaultValue: status });-if (loading) {return (<div@@ -176,8 +166,8 @@ export function Dashboard() {</span></div><span className="phone">{session.phone || '—'}</span>- <span className={`status-pill ${session.status}`}>{formatStatus(session.status)}</span>- <span className="last-active">{formatLastActive(session.lastActive)}</span>+ <span className={`status-pill ${session.status}`}>{formatSessionStatus(t, session.status)}</span>+ <span className="last-active">{formatLastActive(t, session.lastActive)}</span><div className="actions"><button className="btn-sm" onClick={() => navigate('/sessions')}>{t('dashboard.view')}diff --git a/dashboard/src/pages/Sessions.tsx b/dashboard/src/pages/Sessions.tsxindex be41d3157..2187b4318 100644--- a/dashboard/src/pages/Sessions.tsx+++ b/dashboard/src/pages/Sessions.tsx@@ -52,6 +52,7 @@ import { PageHeader } from '../components/PageHeader';import { CustomSelect } from '../components/CustomSelect';import { Modal } from '../components/Modal';import './Sessions.css';+import { formatLastActive, formatSessionStatus } from '../utils/sessionDisplay';/*** The hover title for a restriction: the engine's own cause token, plus when enforcement ends if@@ -638,16 +639,6 @@ export function Sessions() {}};- const formatLastActive = (date?: string | null) => {- if (!date) return t('common.never');- const diff = Date.now() - new Date(date).getTime();- if (diff < 60000) return t('common.justNow');- if (diff < 3600000) return t('common.minAgo', { count: Math.floor(diff / 60000) });- return new Date(date).toLocaleDateString();- };-- const formatStatus = (status: string) => t(`sessionStatus.${status}`, { defaultValue: status });-const filteredSessions = filterSessions(sessions, searchQuery, statusFilter);const existingSessionNames = sessions.map(s => s.name);// Empty is a disabled button, not a message: the form stays quiet until the user types something.@@ -976,7 +967,9 @@ export function Sessions() {</div><div className="detail-item"><span className="detail-label">{t('sessions.details.status')}</span>- <span className={`status-badge ${selectedSession.status}`}>{formatStatus(selectedSession.status)}</span>+ <span className={`status-badge ${selectedSession.status}`}>+ {formatSessionStatus(t, selectedSession.status)}+ </span></div><div className="detail-item"><span className="detail-label">{t('sessions.details.sessionId')}</span>@@ -1235,7 +1228,7 @@ export function Sessions() {<div key={session.id} className="session-card"><div className="card-header"><h3 title={session.name}>{session.name}</h3>- <span className={`status-pill ${session.status}`}>{formatStatus(session.status)}</span>+ <span className={`status-pill ${session.status}`}>{formatSessionStatus(t, session.status)}</span></div>{awaitsPairing(session) ? (@@ -1266,7 +1259,7 @@ export function Sessions() {</div><div className="info-row"><span className="info-label">{t('sessions.card.lastActive')}</span>- <span className="info-value">{formatLastActive(session.lastActive)}</span>+ <span className="info-value">{formatLastActive(t, session.lastActive)}</span></div>{(session.status === 'failed' || session.status === 'action_required') && session.lastError ? (<div className="info-row session-error">diff --git a/dashboard/src/utils/sessionDisplay.test.ts b/dashboard/src/utils/sessionDisplay.test.tsnew file mode 100644index 000000000..dd3664216--- /dev/null+++ b/dashboard/src/utils/sessionDisplay.test.ts@@ -0,0 +1,32 @@+import { test } from 'node:test';+import assert from 'node:assert/strict';+import type { TFunction } from 'i18next';+import { formatLastActive, formatSessionStatus } from './sessionDisplay.ts';++// A stand-in that shows which key and values the phrase was asked for.+const t = ((key: string, options?: { count?: number; defaultValue?: string }) =>+ options?.count !== undefined ? `${key}:${options.count}` : (options?.defaultValue ?? key)) as unknown as TFunction;++const NOW = Date.parse('2026-10-20T12:00:00Z');+const ago = (ms: number): string => new Date(NOW - ms).toISOString();++test('formatLastActive: a missing date reads as never', () => {+ assert.equal(formatLastActive(t, null, NOW), 'common.never');+ assert.equal(formatLastActive(t, undefined, NOW), 'common.never');+});++test('formatLastActive: phrases up to a day, in minutes then hours', () => {+ assert.equal(formatLastActive(t, ago(30_000), NOW), 'common.justNow');+ assert.equal(formatLastActive(t, ago(5 * 60_000), NOW), 'common.minAgo:5');+ assert.equal(formatLastActive(t, ago(59 * 60_000), NOW), 'common.minAgo:59');+ // The Sessions page used to skip this step and show a date for a session active five hours ago.+ assert.equal(formatLastActive(t, ago(5 * 3_600_000), NOW), 'common.hoursAgo:5');+});++test('formatLastActive: a day or more ago is the date', () => {+ assert.equal(formatLastActive(t, ago(25 * 3_600_000), NOW), new Date(NOW - 25 * 3_600_000).toLocaleDateString());+});++test('formatSessionStatus: an unknown status shows as it is', () => {+ assert.equal(formatSessionStatus(t, 'brand_new'), 'brand_new');+});diff --git a/dashboard/src/utils/sessionDisplay.ts b/dashboard/src/utils/sessionDisplay.tsnew file mode 100644index 000000000..927628eba--- /dev/null+++ b/dashboard/src/utils/sessionDisplay.ts@@ -0,0 +1,16 @@+import type { TFunction } from 'i18next';++/** How long ago a session was last active: a phrase up to a day, the date after that. */+export function formatLastActive(t: TFunction, date?: string | null, now: number = Date.now()): string {+ if (!date) return t('common.never');+ const diff = now - new Date(date).getTime();+ if (diff < 60_000) return t('common.justNow');+ if (diff < 3_600_000) return t('common.minAgo', { count: Math.floor(diff / 60_000) });+ if (diff < 86_400_000) return t('common.hoursAgo', { count: Math.floor(diff / 3_600_000) });+ return new Date(date).toLocaleDateString();+}++/** A session status as the operator reads it; a status the catalogue does not know shows as it is. */+export function formatSessionStatus(t: TFunction, status: string): string {+ return t(`sessionStatus.${status}`, { defaultValue: status });+}