Show reset date below quota progress bars in admin UI
This commit is contained in:
parent
5b97ed0ef7
commit
25f19b6ada
@ -47,6 +47,8 @@ async def read_api_keys(
|
||||
item.tokens_used_month = usage.tokens_used_month or 0
|
||||
item.requests_today = usage.requests_today or 0
|
||||
item.requests_month = usage.requests_month or 0
|
||||
item.daily_reset_at = usage.daily_reset_at
|
||||
item.monthly_reset_at = usage.monthly_reset_at
|
||||
result.append(item)
|
||||
return result
|
||||
|
||||
|
||||
@ -58,6 +58,8 @@ class APIKeyWithUsage(APIKey):
|
||||
tokens_used_month: int = 0
|
||||
requests_today: int = 0
|
||||
requests_month: int = 0
|
||||
daily_reset_at: Optional[datetime] = None
|
||||
monthly_reset_at: Optional[datetime] = None
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
@ -11,17 +11,28 @@ function authHeaders(token) {
|
||||
|
||||
const fmtK = (n) => { const k = n / 1000; return k % 1 === 0 ? `${k}k` : `${k.toFixed(1)}k`; };
|
||||
|
||||
function QuotaBar({ used, limit, isToken = false }) {
|
||||
if (limit == null) return <span className="quota-unlimited">∞</span>;
|
||||
function QuotaBar({ used, limit, isToken = false, since = null }) {
|
||||
const fmt = isToken ? fmtK : (n) => n.toLocaleString('de-DE');
|
||||
const sinceLabel = since
|
||||
? new Date(since).toLocaleDateString('de-DE', { day: '2-digit', month: '2-digit' })
|
||||
: null;
|
||||
|
||||
if (limit == null) return (
|
||||
<div className="quota-cell">
|
||||
<span className="quota-unlimited">∞</span>
|
||||
{sinceLabel && <span className="quota-since">seit {sinceLabel}</span>}
|
||||
</div>
|
||||
);
|
||||
|
||||
const pct = Math.min(100, (used / limit) * 100);
|
||||
const color = pct >= 90 ? '#e74c3c' : pct >= 70 ? '#e67e22' : '#27ae60';
|
||||
const fmt = isToken ? fmtK : (n) => n.toLocaleString('de-DE');
|
||||
return (
|
||||
<div className="quota-cell">
|
||||
<span className="quota-label">{fmt(used)} / {fmt(limit)}</span>
|
||||
<div className="progress-bar">
|
||||
<div className="progress-fill" style={{ width: `${pct}%`, backgroundColor: color }} />
|
||||
</div>
|
||||
{sinceLabel && <span className="quota-since">seit {sinceLabel}</span>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@ -400,10 +411,10 @@ function App() {
|
||||
<td>{key.name}</td>
|
||||
<td>{displayKey(key.key_prefix)}</td>
|
||||
<td>{key.expires_at ? new Date(key.expires_at).toLocaleDateString('de-DE', { timeZone: 'Europe/Berlin' }) : '∞'}</td>
|
||||
<td><QuotaBar used={key.tokens_used_today} limit={key.daily_tokens} isToken /></td>
|
||||
<td><QuotaBar used={key.tokens_used_month} limit={key.monthly_tokens} isToken /></td>
|
||||
<td><QuotaBar used={key.requests_today} limit={key.daily_requests} /></td>
|
||||
<td><QuotaBar used={key.requests_month} limit={key.monthly_requests} /></td>
|
||||
<td><QuotaBar used={key.tokens_used_today} limit={key.daily_tokens} isToken since={key.daily_reset_at} /></td>
|
||||
<td><QuotaBar used={key.tokens_used_month} limit={key.monthly_tokens} isToken since={key.monthly_reset_at} /></td>
|
||||
<td><QuotaBar used={key.requests_today} limit={key.daily_requests} since={key.daily_reset_at} /></td>
|
||||
<td><QuotaBar used={key.requests_month} limit={key.monthly_requests} since={key.monthly_reset_at} /></td>
|
||||
<td className="action-cell">
|
||||
<button className="btn-icon btn-icon-edit" data-tooltip="Bearbeiten" onClick={() => handleEdit(key)}>✏</button>
|
||||
{key.is_active ? (
|
||||
|
||||
@ -246,6 +246,13 @@ tr:hover {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.quota-since {
|
||||
display: block;
|
||||
font-size: 10px;
|
||||
color: #aaa;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.progress-bar {
|
||||
height: 4px;
|
||||
background: #e2e8f0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user