yiekheng
ee74ebda64
The header used to show '200+' once the user had loaded a partial set
of pages — opaque, useless for an operator who actually needs to know
'how many accounts are in the system right now'.
Server (app/cm_api.py):
- /acc/ and /user/ list responses now wrap the rows alongside a
COUNT(*) of the table: { rows: [...], total: N }. The single-row
/acc/<username> path is unchanged (still returns Acc[] with one row).
- Each list request issues both queries (the page SELECT and the COUNT)
on the same pooled connection. COUNT(*) on a 3k-row table is sub-ms;
even when the cache misses, total request latency stays well under
20ms on warm-cache MySQL.
Web client:
- web/lib/api.ts: Page<T> gains a field; getAccountsPage and
getUsersPage parse the new wrapped response.
- web/app/page.tsx + users/page.tsx: pass page.total down as
initialTotal.
- web/components/{accounts,users}-table.tsx: hold total in state, sync
it from every page fetch (initial, loadMore, sort change, force
refresh) so cm99 monitor inserts during the session bump it correctly.
Delete decrements it by 1 immediately so the header doesn't lie
between the optimistic delete and the next refresh.
- PageHead now shows '<total>' as the big number. When loaded < total,
a small zinc-400 line below reads 'Showing X of N — keep scrolling
to load more'. Once the user reaches the end, the line goes away.
No new round trips for the count: it piggybacks on the same /acc/?...
or /user/?... request that already fetches the page. The 30s cache
covers the count too — so tab switches still don't hit MySQL.
522 lines
18 KiB
TypeScript
522 lines
18 KiB
TypeScript
"use client";
|
||
|
||
import { useEffect, useOptimistic, useRef, useState, useTransition } from "react";
|
||
import type { User } from "@/lib/types";
|
||
import {
|
||
deleteUser,
|
||
loadMoreUsers,
|
||
refreshUsers,
|
||
updateUser,
|
||
} from "@/app/actions";
|
||
import EditableCell from "./editable-cell";
|
||
import ConfirmDialog from "./confirm-dialog";
|
||
import CreateUserDialog from "./create-user-dialog";
|
||
import Toast, { type ToastMessage } from "./toast";
|
||
|
||
type Props = {
|
||
initial: User[];
|
||
initialHasMore: boolean;
|
||
initialTotal: number;
|
||
prefixPattern: string;
|
||
};
|
||
type SortDir = "asc" | "desc";
|
||
type SortKey = "f_username" | "last_update_time";
|
||
type OptimisticPatch = {
|
||
f_username: string;
|
||
field: keyof Pick<User, "f_password" | "t_username" | "t_password">;
|
||
value: string;
|
||
};
|
||
|
||
function formatTime(t: string | null) {
|
||
if (!t) return <em className="not-italic text-zinc-400">—</em>;
|
||
const d = new Date(t);
|
||
if (Number.isNaN(d.getTime())) return t;
|
||
return d.toLocaleString(undefined, {
|
||
month: "short",
|
||
day: "2-digit",
|
||
hour: "2-digit",
|
||
minute: "2-digit",
|
||
});
|
||
}
|
||
|
||
function DeleteButton({
|
||
label,
|
||
onClick,
|
||
}: {
|
||
label: string;
|
||
onClick: () => void;
|
||
}) {
|
||
return (
|
||
<button
|
||
type="button"
|
||
onClick={onClick}
|
||
aria-label={`Delete ${label}`}
|
||
className="inline-flex h-7 w-7 items-center justify-center rounded-md text-zinc-400 transition-colors hover:bg-red-50 hover:text-red-600 focus:outline-none focus-visible:ring-2 focus-visible:ring-red-400"
|
||
>
|
||
<span aria-hidden="true" className="text-base leading-none">
|
||
×
|
||
</span>
|
||
</button>
|
||
);
|
||
}
|
||
|
||
export default function UsersTable({
|
||
initial,
|
||
initialHasMore,
|
||
initialTotal,
|
||
prefixPattern,
|
||
}: Props) {
|
||
const [sortKey, setSortKey] = useState<SortKey>("last_update_time");
|
||
const [sortDir, setSortDir] = useState<SortDir>("desc");
|
||
const [editingKey, setEditingKey] = useState<string | null>(null);
|
||
const [, startTransition] = useTransition();
|
||
const [refreshing, setRefreshing] = useState(false);
|
||
const [loadingMore, setLoadingMore] = useState(false);
|
||
const [deleteTarget, setDeleteTarget] = useState<string | null>(null);
|
||
const [deleting, setDeleting] = useState(false);
|
||
const [deleteError, setDeleteError] = useState<string | null>(null);
|
||
const [createOpen, setCreateOpen] = useState(false);
|
||
const [toast, setToast] = useState<ToastMessage | null>(null);
|
||
|
||
const [rows, setRows] = useState<User[]>(initial);
|
||
const [hasMore, setHasMore] = useState<boolean>(initialHasMore);
|
||
const [total, setTotal] = useState<number>(initialTotal);
|
||
const sentinelRef = useRef<HTMLDivElement | null>(null);
|
||
|
||
const [optimistic, applyOptimistic] = useOptimistic<User[], OptimisticPatch>(
|
||
rows,
|
||
(state, patch) =>
|
||
state.map((row) =>
|
||
row.f_username === patch.f_username ? { ...row, [patch.field]: patch.value } : row,
|
||
),
|
||
);
|
||
|
||
function saveCell(
|
||
f_username: string,
|
||
field: OptimisticPatch["field"],
|
||
value: string,
|
||
) {
|
||
return new Promise<{ ok: boolean; error?: string }>((resolve) => {
|
||
startTransition(async () => {
|
||
applyOptimistic({ f_username, field, value });
|
||
const row = rows.find((r) => r.f_username === f_username);
|
||
if (!row) return resolve({ ok: false, error: "row not found" });
|
||
const next = {
|
||
f_username: row.f_username,
|
||
f_password: row.f_password,
|
||
t_username: row.t_username,
|
||
t_password: row.t_password,
|
||
[field]: value,
|
||
};
|
||
const result = await updateUser(next);
|
||
if (result.ok) {
|
||
setRows((prev) =>
|
||
prev.map((r) =>
|
||
r.f_username === f_username ? { ...r, [field]: value } : r,
|
||
),
|
||
);
|
||
resolve({ ok: true });
|
||
} else {
|
||
resolve({ ok: false, error: result.error });
|
||
}
|
||
});
|
||
});
|
||
}
|
||
|
||
async function refresh() {
|
||
setRefreshing(true);
|
||
try {
|
||
const page = await refreshUsers({
|
||
prefix: prefixPattern,
|
||
sort: sortKey,
|
||
dir: sortDir,
|
||
});
|
||
setRows(page.rows);
|
||
setHasMore(page.hasMore);
|
||
setTotal(page.total);
|
||
} finally {
|
||
setRefreshing(false);
|
||
}
|
||
}
|
||
|
||
async function changeSort(nextKey: SortKey) {
|
||
let nextDir: SortDir;
|
||
if (nextKey === sortKey) {
|
||
nextDir = sortDir === "asc" ? "desc" : "asc";
|
||
} else {
|
||
nextDir = "desc";
|
||
}
|
||
setSortKey(nextKey);
|
||
setSortDir(nextDir);
|
||
setLoadingMore(true);
|
||
try {
|
||
const page = await loadMoreUsers({
|
||
offset: 0,
|
||
prefix: prefixPattern,
|
||
sort: nextKey,
|
||
dir: nextDir,
|
||
});
|
||
setRows(page.rows);
|
||
setHasMore(page.hasMore);
|
||
setTotal(page.total);
|
||
} finally {
|
||
setLoadingMore(false);
|
||
}
|
||
}
|
||
|
||
useEffect(() => {
|
||
if (!hasMore || loadingMore || refreshing) return;
|
||
const sentinel = sentinelRef.current;
|
||
if (!sentinel) return;
|
||
const observer = new IntersectionObserver(
|
||
(entries) => {
|
||
if (!entries.some((e) => e.isIntersecting)) return;
|
||
setLoadingMore(true);
|
||
loadMoreUsers({
|
||
offset: rows.length,
|
||
prefix: prefixPattern,
|
||
sort: sortKey,
|
||
dir: sortDir,
|
||
})
|
||
.then((page) => {
|
||
setRows((prev) => [...prev, ...page.rows]);
|
||
setHasMore(page.hasMore);
|
||
setTotal(page.total);
|
||
})
|
||
.catch((err) => console.error("loadMoreUsers failed:", err))
|
||
.finally(() => setLoadingMore(false));
|
||
},
|
||
{ rootMargin: "300px 0px" },
|
||
);
|
||
observer.observe(sentinel);
|
||
return () => observer.disconnect();
|
||
}, [hasMore, loadingMore, refreshing, rows.length, prefixPattern, sortKey, sortDir]);
|
||
|
||
async function confirmDelete() {
|
||
if (!deleteTarget) return;
|
||
setDeleting(true);
|
||
setDeleteError(null);
|
||
const result = await deleteUser(deleteTarget);
|
||
setDeleting(false);
|
||
if (result.ok) {
|
||
const deleted = deleteTarget;
|
||
setRows((prev) => prev.filter((r) => r.f_username !== deleted));
|
||
setTotal((t) => Math.max(0, t - 1));
|
||
setDeleteTarget(null);
|
||
setToast({ type: "success", message: `User ${deleted} deleted` });
|
||
} else {
|
||
setDeleteError(result.error);
|
||
}
|
||
}
|
||
|
||
function HeaderTh({ k, label }: { k: SortKey; label: string }) {
|
||
const active = sortKey === k;
|
||
return (
|
||
<button
|
||
type="button"
|
||
onClick={() => changeSort(k)}
|
||
className={`inline-flex items-center gap-1 text-[11px] font-medium uppercase tracking-wider transition-colors ${
|
||
active ? "text-zinc-900" : "text-zinc-500 hover:text-zinc-900"
|
||
}`}
|
||
>
|
||
{label}
|
||
<span aria-hidden="true">{active ? (sortDir === "asc" ? "↑" : "↓") : "↕"}</span>
|
||
</button>
|
||
);
|
||
}
|
||
|
||
if (rows.length === 0) {
|
||
return (
|
||
<div>
|
||
<PageHead
|
||
total={total}
|
||
loaded={0}
|
||
onRefresh={refresh}
|
||
refreshing={refreshing}
|
||
onAdd={() => setCreateOpen(true)}
|
||
/>
|
||
<div className="mt-6 rounded-2xl bg-white px-8 py-16 text-center ring-1 ring-zinc-200/60">
|
||
<p className="text-sm text-zinc-500">
|
||
No users yet. Click <span className="font-medium text-zinc-700">Add</span> to create one manually.
|
||
</p>
|
||
</div>
|
||
<CreateUserDialog
|
||
open={createOpen}
|
||
onClose={() => setCreateOpen(false)}
|
||
onSuccess={async (name) => {
|
||
setToast({ type: "success", message: `User ${name} created` });
|
||
await refresh();
|
||
}}
|
||
/>
|
||
<Toast toast={toast} onDismiss={() => setToast(null)} />
|
||
</div>
|
||
);
|
||
}
|
||
|
||
return (
|
||
<div>
|
||
<PageHead
|
||
total={total}
|
||
loaded={optimistic.length}
|
||
onRefresh={refresh}
|
||
refreshing={refreshing}
|
||
onAdd={() => setCreateOpen(true)}
|
||
/>
|
||
|
||
<div className="mt-6 hidden overflow-hidden rounded-2xl bg-white ring-1 ring-zinc-200/60 sm:block">
|
||
<table className="w-full table-fixed border-collapse">
|
||
<thead>
|
||
<tr className="bg-zinc-50/60">
|
||
<th className="w-[18%] px-5 py-3 text-left">
|
||
<HeaderTh k="f_username" label="From username" />
|
||
</th>
|
||
<th className="w-[18%] px-5 py-3 text-left text-[11px] font-medium uppercase tracking-wider text-zinc-500">
|
||
From password
|
||
</th>
|
||
<th className="w-[18%] px-5 py-3 text-left text-[11px] font-medium uppercase tracking-wider text-zinc-500">
|
||
To username
|
||
</th>
|
||
<th className="w-[18%] px-5 py-3 text-left text-[11px] font-medium uppercase tracking-wider text-zinc-500">
|
||
To password
|
||
</th>
|
||
<th className="px-5 py-3 text-left">
|
||
<HeaderTh k="last_update_time" label="Last update" />
|
||
</th>
|
||
<th className="w-12 px-3 py-3" aria-hidden="true" />
|
||
</tr>
|
||
</thead>
|
||
<tbody className="divide-y divide-zinc-100">
|
||
{optimistic.map((row) => {
|
||
const k = (f: string) => `${row.f_username}::${f}`;
|
||
return (
|
||
<tr key={row.f_username} className="transition-colors hover:bg-zinc-50/60">
|
||
<td className="px-5 py-3 align-middle font-mono text-[13px] font-semibold text-zinc-900">
|
||
{row.f_username}
|
||
</td>
|
||
<td className="px-5 py-3 align-middle">
|
||
<EditableCell
|
||
value={row.f_password}
|
||
label={`from password for ${row.f_username}`}
|
||
isCurrentlyEditing={editingKey === k("f_password")}
|
||
onEditStart={() => setEditingKey(k("f_password"))}
|
||
onEditEnd={() => setEditingKey(null)}
|
||
onSave={(v) => saveCell(row.f_username, "f_password", v)}
|
||
/>
|
||
</td>
|
||
<td className="px-5 py-3 align-middle">
|
||
<EditableCell
|
||
value={row.t_username}
|
||
label={`to username for ${row.f_username}`}
|
||
isCurrentlyEditing={editingKey === k("t_username")}
|
||
onEditStart={() => setEditingKey(k("t_username"))}
|
||
onEditEnd={() => setEditingKey(null)}
|
||
onSave={(v) => saveCell(row.f_username, "t_username", v)}
|
||
/>
|
||
</td>
|
||
<td className="px-5 py-3 align-middle">
|
||
<EditableCell
|
||
value={row.t_password}
|
||
label={`to password for ${row.f_username}`}
|
||
isCurrentlyEditing={editingKey === k("t_password")}
|
||
onEditStart={() => setEditingKey(k("t_password"))}
|
||
onEditEnd={() => setEditingKey(null)}
|
||
onSave={(v) => saveCell(row.f_username, "t_password", v)}
|
||
/>
|
||
</td>
|
||
<td className="px-5 py-3 align-middle text-xs text-zinc-500">
|
||
{formatTime(row.last_update_time)}
|
||
</td>
|
||
<td className="px-3 py-3 text-right align-middle">
|
||
<DeleteButton
|
||
label={row.f_username}
|
||
onClick={() => {
|
||
setDeleteError(null);
|
||
setDeleteTarget(row.f_username);
|
||
}}
|
||
/>
|
||
</td>
|
||
</tr>
|
||
);
|
||
})}
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
|
||
<div className="mt-6 space-y-3 sm:hidden">
|
||
{optimistic.map((row) => {
|
||
const k = (f: string) => `${row.f_username}::${f}`;
|
||
return (
|
||
<div key={row.f_username} className="rounded-2xl bg-white p-5 ring-1 ring-zinc-200/60">
|
||
<div className="flex items-center justify-between gap-2">
|
||
<span className="font-mono text-base font-semibold text-zinc-900">
|
||
{row.f_username}
|
||
</span>
|
||
<div className="flex items-center gap-2">
|
||
<span className="text-[11px] text-zinc-500">
|
||
{formatTime(row.last_update_time)}
|
||
</span>
|
||
<DeleteButton
|
||
label={row.f_username}
|
||
onClick={() => {
|
||
setDeleteError(null);
|
||
setDeleteTarget(row.f_username);
|
||
}}
|
||
/>
|
||
</div>
|
||
</div>
|
||
<dl className="mt-4 space-y-3 border-t border-zinc-100 pt-4">
|
||
<MobileRow label="From PW">
|
||
<EditableCell
|
||
value={row.f_password}
|
||
label={`from password for ${row.f_username}`}
|
||
isCurrentlyEditing={editingKey === k("f_password")}
|
||
onEditStart={() => setEditingKey(k("f_password"))}
|
||
onEditEnd={() => setEditingKey(null)}
|
||
onSave={(v) => saveCell(row.f_username, "f_password", v)}
|
||
/>
|
||
</MobileRow>
|
||
<MobileRow label="To User">
|
||
<EditableCell
|
||
value={row.t_username}
|
||
label={`to username for ${row.f_username}`}
|
||
isCurrentlyEditing={editingKey === k("t_username")}
|
||
onEditStart={() => setEditingKey(k("t_username"))}
|
||
onEditEnd={() => setEditingKey(null)}
|
||
onSave={(v) => saveCell(row.f_username, "t_username", v)}
|
||
/>
|
||
</MobileRow>
|
||
<MobileRow label="To PW">
|
||
<EditableCell
|
||
value={row.t_password}
|
||
label={`to password for ${row.f_username}`}
|
||
isCurrentlyEditing={editingKey === k("t_password")}
|
||
onEditStart={() => setEditingKey(k("t_password"))}
|
||
onEditEnd={() => setEditingKey(null)}
|
||
onSave={(v) => saveCell(row.f_username, "t_password", v)}
|
||
/>
|
||
</MobileRow>
|
||
</dl>
|
||
</div>
|
||
);
|
||
})}
|
||
</div>
|
||
|
||
<div ref={sentinelRef} className="h-10" aria-hidden="true" />
|
||
{loadingMore && (
|
||
<p className="mt-4 text-center text-[11px] font-medium uppercase tracking-wider text-zinc-400">
|
||
Loading more…
|
||
</p>
|
||
)}
|
||
{!hasMore && rows.length > 0 && (
|
||
<p className="mt-6 text-center text-[11px] text-zinc-400">
|
||
End of list — {rows.length} users loaded
|
||
</p>
|
||
)}
|
||
|
||
<CreateUserDialog
|
||
open={createOpen}
|
||
onClose={() => setCreateOpen(false)}
|
||
onSuccess={async (name) => {
|
||
setToast({ type: "success", message: `User ${name} created` });
|
||
await refresh();
|
||
}}
|
||
/>
|
||
|
||
<Toast toast={toast} onDismiss={() => setToast(null)} />
|
||
|
||
<ConfirmDialog
|
||
open={!!deleteTarget}
|
||
onCancel={() => {
|
||
if (!deleting) setDeleteTarget(null);
|
||
}}
|
||
onConfirm={confirmDelete}
|
||
title={`Delete ${deleteTarget ?? ""}?`}
|
||
message={
|
||
<>
|
||
<p>
|
||
Permanently remove the user pairing for{" "}
|
||
<code className="rounded bg-zinc-100 px-1.5 py-0.5 font-mono text-xs text-zinc-700">
|
||
{deleteTarget}
|
||
</code>{" "}
|
||
from the users table. This action cannot be undone and only
|
||
removes the pairing — the underlying account row stays.
|
||
</p>
|
||
{deleteError && (
|
||
<p className="mt-3 font-mono text-[11px] text-red-600" role="alert">
|
||
{deleteError}
|
||
</p>
|
||
)}
|
||
</>
|
||
}
|
||
confirmLabel="Delete"
|
||
destructive
|
||
pending={deleting}
|
||
/>
|
||
</div>
|
||
);
|
||
}
|
||
|
||
function MobileRow({ label, children }: { label: string; children: React.ReactNode }) {
|
||
return (
|
||
<div className="grid grid-cols-[max-content_1fr] items-baseline gap-x-4">
|
||
<dt className="text-[11px] font-medium uppercase tracking-wider text-zinc-500">{label}</dt>
|
||
<dd className="min-w-0">{children}</dd>
|
||
</div>
|
||
);
|
||
}
|
||
|
||
function PageHead({
|
||
total,
|
||
loaded,
|
||
onRefresh,
|
||
refreshing,
|
||
onAdd,
|
||
}: {
|
||
total: number;
|
||
loaded: number;
|
||
onRefresh: () => void;
|
||
refreshing: boolean;
|
||
onAdd: () => void;
|
||
}) {
|
||
const showLoaded = loaded > 0 && loaded < total;
|
||
return (
|
||
<div className="flex flex-wrap items-end justify-between gap-4">
|
||
<div>
|
||
<p className="text-[11px] font-medium uppercase tracking-wider text-zinc-500">Table</p>
|
||
<h1 className="mt-1 text-2xl font-semibold tracking-tight text-zinc-900 sm:text-3xl">
|
||
Users
|
||
<span className="ml-2 align-middle text-base font-medium text-zinc-400">
|
||
{total}
|
||
</span>
|
||
</h1>
|
||
{showLoaded && (
|
||
<p className="mt-1 text-[11px] text-zinc-400">
|
||
Showing {loaded} of {total} — keep scrolling to load more
|
||
</p>
|
||
)}
|
||
</div>
|
||
<div className="flex items-center gap-2">
|
||
<button
|
||
type="button"
|
||
onClick={onRefresh}
|
||
disabled={refreshing}
|
||
className="inline-flex items-center gap-2 rounded-full bg-white px-4 py-2 text-xs font-medium text-zinc-700 shadow-sm ring-1 ring-zinc-200 transition-colors hover:bg-zinc-50 hover:text-zinc-900 disabled:opacity-60"
|
||
>
|
||
<span aria-hidden="true" className={refreshing ? "inline-block animate-spin" : ""}>
|
||
⟳
|
||
</span>
|
||
Refresh
|
||
</button>
|
||
<button
|
||
type="button"
|
||
onClick={onAdd}
|
||
className="inline-flex items-center gap-1.5 rounded-full bg-zinc-900 px-4 py-2 text-xs font-medium text-white shadow-sm transition-colors hover:bg-zinc-700"
|
||
>
|
||
<span aria-hidden="true">+</span>
|
||
Add
|
||
</button>
|
||
</div>
|
||
</div>
|
||
);
|
||
}
|