feat(admin): P1 — clearer tickets labels, pagination, min_staff_rank, analytics errors
Co-authored-by: Cursor <[email protected]>
This commit is contained in:
1 parent
75cdfdebe4
commit
f150aea8b9
13 files changed
+311
-101
No files matched your search
@@ -6,8 +6,8 @@ import {
|
||||
TrendingUp,
|
||||
Users,
|
||||
} from "lucide-react";
|
||||
import { getLocale, getTranslations } from "next-intl/server";
|
||||
import { redirect } from "next/navigation";
|
||||
import { getLocale, getTranslations } from "next-intl/server";
|
||||
import { DashboardChart } from "@/components/admin/dashboard-chart";
|
||||
import { PeakHoursHeatmap } from "@/components/admin/peak-hours-heatmap";
|
||||
import { StatsCard } from "@/components/admin/stats-card";
|
||||
@@ -46,19 +46,24 @@ const EMPTY: AnalyticsData = {
|
||||
},
|
||||
};
|
||||
|
||||
async function safeCount(fn: () => Promise<number>): Promise<number> {
|
||||
async function safeCount(
|
||||
fn: () => Promise<number>,
|
||||
): Promise<{ value: number; ok: boolean }> {
|
||||
try {
|
||||
return await fn();
|
||||
return { value: await fn(), ok: true };
|
||||
} catch {
|
||||
return 0;
|
||||
return { value: 0, ok: false };
|
||||
}
|
||||
}
|
||||
|
||||
async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
async function getAnalyticsData(
|
||||
locale: string,
|
||||
): Promise<{ data: AnalyticsData; degraded: boolean }> {
|
||||
const now = Math.floor(Date.now() / 1000);
|
||||
const todayStart = now - (now % 86400);
|
||||
const weekAgo = now - 7 * 86400;
|
||||
const monthAgo = now - 30 * 86400;
|
||||
let degraded = false;
|
||||
|
||||
try {
|
||||
const [
|
||||
@@ -86,9 +91,9 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
try {
|
||||
const rows = await prisma.$queryRaw<{ count: bigint }[]>`
|
||||
SELECT COUNT(*) AS count FROM chatlogs_room WHERE timestamp >= ${weekAgo}`;
|
||||
return Number(rows[0]?.count ?? 0);
|
||||
return { value: Number(rows[0]?.count ?? 0), ok: true };
|
||||
} catch {
|
||||
return 0;
|
||||
return { value: 0, ok: false };
|
||||
}
|
||||
})(),
|
||||
safeCount(() =>
|
||||
@@ -99,6 +104,20 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
),
|
||||
]);
|
||||
|
||||
for (const r of [
|
||||
totalUsers,
|
||||
onlineUsers,
|
||||
weekRegistrations,
|
||||
monthRegistrations,
|
||||
totalRooms,
|
||||
activeRooms,
|
||||
weekChatMessages,
|
||||
weekTrades,
|
||||
weekBans,
|
||||
]) {
|
||||
if (!r.ok) degraded = true;
|
||||
}
|
||||
|
||||
let registrationChart: { label: string; value: number }[] = [];
|
||||
try {
|
||||
const regRows = await prisma.$queryRaw<
|
||||
@@ -126,6 +145,7 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
}
|
||||
} catch {
|
||||
registrationChart = [];
|
||||
degraded = true;
|
||||
}
|
||||
|
||||
const grid: number[][] = Array.from({ length: 7 }, () => Array(24).fill(0));
|
||||
@@ -150,24 +170,27 @@ async function getAnalyticsData(locale: string): Promise<AnalyticsData> {
|
||||
if (count > max) max = count;
|
||||
}
|
||||
} catch {
|
||||
/* keep empty grid */
|
||||
degraded = true;
|
||||
}
|
||||
|
||||
return {
|
||||
totalUsers,
|
||||
onlineUsers,
|
||||
weekRegistrations,
|
||||
monthRegistrations,
|
||||
totalRooms,
|
||||
activeRooms,
|
||||
weekChatMessages,
|
||||
weekTrades,
|
||||
weekBans,
|
||||
registrationChart,
|
||||
peakHours: { grid, max },
|
||||
degraded,
|
||||
data: {
|
||||
totalUsers: totalUsers.value,
|
||||
onlineUsers: onlineUsers.value,
|
||||
weekRegistrations: weekRegistrations.value,
|
||||
monthRegistrations: monthRegistrations.value,
|
||||
totalRooms: totalRooms.value,
|
||||
activeRooms: activeRooms.value,
|
||||
weekChatMessages: weekChatMessages.value,
|
||||
weekTrades: weekTrades.value,
|
||||
weekBans: weekBans.value,
|
||||
registrationChart,
|
||||
peakHours: { grid, max },
|
||||
},
|
||||
};
|
||||
} catch {
|
||||
return EMPTY;
|
||||
return { data: EMPTY, degraded: true };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,10 +202,15 @@ export default async function AnalyticsPage() {
|
||||
|
||||
const locale = await getLocale();
|
||||
const t = await getTranslations("pages.admin.analytics");
|
||||
const data = await getAnalyticsData(locale);
|
||||
const { data, degraded } = await getAnalyticsData(locale);
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
{degraded ? (
|
||||
<div className="rounded-lg bg-[var(--admin-error-subtle)] p-3 text-xs text-[var(--admin-error)]">
|
||||
{t("loadError")}
|
||||
</div>
|
||||
) : null}
|
||||
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
|
||||
<StatsCard
|
||||
title={t("totalUsers")}
|
||||
|
||||
Reference in new issue
Block a user