Revert "Merge pull request #185 from BEDOLAGA-DEV/feat/traffic-filters-devices"

This reverts commit e824945b73, reversing
changes made to 81fcf54b15.
This commit is contained in:
Fringg
2026-02-07 11:29:41 +03:00
parent e824945b73
commit b5a0562615
6 changed files with 87 additions and 562 deletions

View File

@@ -15,7 +15,6 @@ export interface UserTrafficItem {
subscription_status: string | null;
traffic_limit_gb: number;
device_limit: number;
connected_devices: number;
node_traffic: Record<string, number>;
total_bytes: number;
}
@@ -28,7 +27,6 @@ export interface TrafficUsageResponse {
limit: number;
period_days: number;
available_tariffs: string[];
available_statuses: string[];
}
export interface ExportCsvResponse {
@@ -44,10 +42,6 @@ export type TrafficParams = {
sort_by?: string;
sort_desc?: boolean;
tariffs?: string;
nodes?: string;
statuses?: string;
start_date?: string;
end_date?: string;
};
const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
@@ -63,10 +57,6 @@ function buildCacheKey(params: TrafficParams): string {
sb: params.sort_by ?? 'total_bytes',
sd: params.sort_desc ?? true,
t: params.tariffs ?? '',
n: params.nodes ?? '',
st: params.statuses ?? '',
sd2: params.start_date ?? '',
ed: params.end_date ?? '',
});
}
@@ -105,15 +95,7 @@ export const adminTrafficApi = {
trafficCache.clear();
},
exportCsv: async (data: {
period: number;
start_date?: string;
end_date?: string;
tariffs?: string;
nodes?: string;
statuses?: string;
search?: string;
}): Promise<ExportCsvResponse> => {
exportCsv: async (data: { period: number }): Promise<ExportCsvResponse> => {
const response = await apiClient.post('/cabinet/admin/traffic/export-csv', data);
return response.data;
},

View File

@@ -804,18 +804,7 @@
"loading": "Loading traffic data...",
"noTariff": "\u2014",
"search": "Search by name or username",
"allTariffs": "All tariffs",
"nodes": "Nodes",
"allNodes": "All nodes",
"status": "Status",
"allStatuses": "All",
"statusActive": "Active",
"statusTrial": "Trial",
"statusExpired": "Expired",
"statusDisabled": "Disabled",
"customDates": "Dates",
"dateFrom": "From",
"dateTo": "To"
"allTariffs": "All tariffs"
},
"emailTemplates": {
"title": "Email Templates",

View File

@@ -685,18 +685,7 @@
"loading": "در حال بارگذاری داده‌های ترافیک...",
"noTariff": "\u2014",
"search": "جستجو بر اساس نام یا نام کاربری",
"allTariffs": "همه تعرفه‌ها",
"nodes": "نودها",
"allNodes": "همه نودها",
"status": "وضعیت",
"allStatuses": "همه",
"statusActive": "فعال",
"statusTrial": "آزمایشی",
"statusExpired": "منقضی",
"statusDisabled": "غیرفعال",
"customDates": "تاریخ",
"dateFrom": "از",
"dateTo": "تا"
"allTariffs": "همه تعرفه‌ها"
},
"emailTemplates": {
"title": "قالب‌های ایمیل",

View File

@@ -825,18 +825,7 @@
"loading": "Загрузка данных о трафике...",
"noTariff": "\u2014",
"search": "Поиск по имени или юзернейму",
"allTariffs": "Все тарифы",
"nodes": "Ноды",
"allNodes": "Все ноды",
"status": "Статус",
"allStatuses": "Все",
"statusActive": "Активная",
"statusTrial": "Пробная",
"statusExpired": "Истекла",
"statusDisabled": "Отключена",
"customDates": "Даты",
"dateFrom": "От",
"dateTo": "До"
"allTariffs": "Все тарифы"
},
"emailTemplates": {
"title": "Email-шаблоны",

View File

@@ -685,18 +685,7 @@
"loading": "正在加载流量数据...",
"noTariff": "\u2014",
"search": "按名称或用户名搜索",
"allTariffs": "所有套餐",
"nodes": "节点",
"allNodes": "所有节点",
"status": "状态",
"allStatuses": "全部",
"statusActive": "活跃",
"statusTrial": "试用",
"statusExpired": "已过期",
"statusDisabled": "已禁用",
"customDates": "日期",
"dateFrom": "从",
"dateTo": "到"
"allTariffs": "所有套餐"
},
"paymentMethods": {
"title": "支付方法",

View File

@@ -52,13 +52,6 @@ const toBackendSortField = (columnId: string): string => {
return columnId;
};
const formatDateForInput = (date: Date): string => {
const y = date.getFullYear();
const m = String(date.getMonth() + 1).padStart(2, '0');
const d = String(date.getDate()).padStart(2, '0');
return `${y}-${m}-${d}`;
};
// ============ Icons ============
const SearchIcon = () => (
@@ -141,32 +134,6 @@ const ChevronDownIcon = () => (
</svg>
);
const CalendarIcon = () => (
<svg className="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="M6.75 3v2.25M17.25 3v2.25M3 18.75V7.5a2.25 2.25 0 012.25-2.25h13.5A2.25 2.25 0 0121 7.5v11.25m-18 0A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75m-18 0v-7.5A2.25 2.25 0 015.25 9h13.5A2.25 2.25 0 0121 11.25v7.5"
/>
</svg>
);
const ServerIcon = () => (
<svg className="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="M5.25 14.25h13.5m-13.5 0a3 3 0 01-3-3m3 3a3 3 0 100 6h13.5a3 3 0 100-6m-16.5-3a3 3 0 013-3h13.5a3 3 0 013 3m-19.5 0a4.5 4.5 0 01.9-2.7L5.737 5.1a3.375 3.375 0 012.7-1.35h7.126c1.062 0 2.062.5 2.7 1.35l2.587 3.45a4.5 4.5 0 01.9 2.7m0 0a3 3 0 01-3 3m0 3h.008v.008h-.008v-.008zm0-6h.008v.008h-.008v-.008zm-3 6h.008v.008h-.008v-.008zm0-6h.008v.008h-.008v-.008z"
/>
</svg>
);
const XIcon = () => (
<svg className="h-3 w-3" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2.5}>
<path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg>
);
// ============ Progress Bar ============
function ProgressBar({ loading }: { loading: boolean }) {
@@ -214,47 +181,6 @@ function ProgressBar({ loading }: { loading: boolean }) {
);
}
// ============ Checkbox helper ============
function Checkbox({ checked }: { checked: boolean }) {
return (
<span
className={`flex h-4 w-4 shrink-0 items-center justify-center rounded border ${
checked ? 'border-accent-500 bg-accent-500' : 'border-dark-600'
}`}
>
{checked && (
<svg
className="h-3 w-3 text-white"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={3}
>
<path strokeLinecap="round" strokeLinejoin="round" d="M4.5 12.75l6 6 9-13.5" />
</svg>
)}
</span>
);
}
// ============ Status dot helper ============
const STATUS_COLORS: Record<string, string> = {
active: 'bg-green-500',
trial: 'bg-yellow-500',
expired: 'bg-red-500',
disabled: 'bg-gray-500',
};
function StatusDot({ status }: { status: string }) {
return (
<span
className={`inline-block h-2 w-2 rounded-full ${STATUS_COLORS[status] || 'bg-gray-500'}`}
/>
);
}
// ============ Components ============
const PERIODS = [1, 3, 7, 14, 30] as const;
@@ -263,96 +189,31 @@ function PeriodSelector({
value,
onChange,
label,
dateMode,
onToggleDateMode,
}: {
value: number;
onChange: (v: number) => void;
label: string;
dateMode: boolean;
onToggleDateMode: () => void;
}) {
const { t } = useTranslation();
return (
<div className="flex items-center gap-2">
<span className="text-xs text-dark-400">{label}</span>
{!dateMode && (
<div className="flex gap-1">
{PERIODS.map((p) => (
<button
key={p}
onClick={() => onChange(p)}
className={`rounded-lg px-2.5 py-1 text-xs font-medium transition-colors ${
value === p
? 'bg-accent-500 text-white'
: 'bg-dark-800 text-dark-400 hover:bg-dark-700 hover:text-dark-200'
}`}
>
{p}
{t('admin.trafficUsage.days')}
</button>
))}
</div>
)}
<button
onClick={onToggleDateMode}
className={`flex items-center gap-1 rounded-lg px-2.5 py-1 text-xs font-medium transition-colors ${
dateMode
? 'bg-accent-500 text-white'
: 'bg-dark-800 text-dark-400 hover:bg-dark-700 hover:text-dark-200'
}`}
>
<CalendarIcon />
{t('admin.trafficUsage.customDates')}
</button>
</div>
);
}
function DateRangePicker({
startDate,
endDate,
onStartChange,
onEndChange,
onClose,
}: {
startDate: string;
endDate: string;
onStartChange: (v: string) => void;
onEndChange: (v: string) => void;
onClose: () => void;
}) {
const { t } = useTranslation();
const today = formatDateForInput(new Date());
const minDate = formatDateForInput(new Date(Date.now() - 31 * 24 * 60 * 60 * 1000));
return (
<div className="flex items-center gap-2">
<CalendarIcon />
<label className="text-xs text-dark-400">{t('admin.trafficUsage.dateFrom')}</label>
<input
type="date"
value={startDate}
onChange={(e) => onStartChange(e.target.value)}
min={minDate}
max={endDate || today}
className="rounded-lg border border-dark-700 bg-dark-800 px-2 py-1 text-xs text-dark-200 focus:border-dark-600 focus:outline-none"
/>
<label className="text-xs text-dark-400">{t('admin.trafficUsage.dateTo')}</label>
<input
type="date"
value={endDate}
onChange={(e) => onEndChange(e.target.value)}
min={startDate || minDate}
max={today}
className="rounded-lg border border-dark-700 bg-dark-800 px-2 py-1 text-xs text-dark-200 focus:border-dark-600 focus:outline-none"
/>
<button
onClick={onClose}
className="rounded-lg p-1 text-dark-400 transition-colors hover:bg-dark-700 hover:text-dark-200"
>
<XIcon />
</button>
<div className="flex gap-1">
{PERIODS.map((p) => (
<button
key={p}
onClick={() => onChange(p)}
className={`rounded-lg px-2.5 py-1 text-xs font-medium transition-colors ${
value === p
? 'bg-accent-500 text-white'
: 'bg-dark-800 text-dark-400 hover:bg-dark-700 hover:text-dark-200'
}`}
>
{p}
{t('admin.trafficUsage.days')}
</button>
))}
</div>
</div>
);
}
@@ -423,211 +284,62 @@ function TariffFilter({
allSelected ? 'text-accent-400' : 'text-dark-300'
}`}
>
<Checkbox checked={allSelected} />
<span
className={`flex h-4 w-4 shrink-0 items-center justify-center rounded border ${
allSelected ? 'border-accent-500 bg-accent-500' : 'border-dark-600'
}`}
>
{allSelected && (
<svg
className="h-3 w-3 text-white"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={3}
>
<path strokeLinecap="round" strokeLinejoin="round" d="M4.5 12.75l6 6 9-13.5" />
</svg>
)}
</span>
{t('admin.trafficUsage.allTariffs')}
</button>
<div className="mx-2 border-t border-dark-700" />
<div className="max-h-48 overflow-y-auto">
{available.map((tariff) => (
<button
key={tariff}
onClick={() => toggle(tariff)}
className="flex w-full items-center gap-2 px-3 py-2 text-left text-xs text-dark-300 transition-colors hover:bg-dark-700"
>
<Checkbox checked={selected.has(tariff)} />
{tariff}
</button>
))}
</div>
</div>
)}
</div>
);
}
function NodeFilter({
available,
selected,
onChange,
}: {
available: TrafficNodeInfo[];
selected: Set<string>;
onChange: (next: Set<string>) => void;
}) {
const { t } = useTranslation();
const [open, setOpen] = useState(false);
const ref = useRef<HTMLDivElement>(null);
useEffect(() => {
const handler = (e: MouseEvent) => {
if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false);
};
document.addEventListener('mousedown', handler);
return () => document.removeEventListener('mousedown', handler);
}, []);
if (available.length === 0) return null;
const allSelected = selected.size === 0;
const activeCount = selected.size;
const toggle = (nodeUuid: string) => {
const next = new Set(selected);
if (next.has(nodeUuid)) {
next.delete(nodeUuid);
} else {
next.add(nodeUuid);
}
onChange(next);
};
const selectAll = () => onChange(new Set());
return (
<div className="relative" ref={ref}>
<button
onClick={() => setOpen(!open)}
className={`flex items-center gap-1.5 rounded-lg border px-3 py-1.5 text-xs font-medium transition-colors ${
activeCount > 0
? 'border-accent-500/50 bg-accent-500/10 text-accent-400'
: 'border-dark-700 bg-dark-800 text-dark-200 hover:border-dark-600 hover:bg-dark-700'
}`}
>
<ServerIcon />
{t('admin.trafficUsage.nodes')}
{activeCount > 0 && (
<span className="rounded-full bg-accent-500 px-1.5 text-[10px] text-white">
{activeCount}
</span>
)}
<ChevronDownIcon />
</button>
{open && (
<div className="absolute left-0 top-full z-30 mt-1 w-56 rounded-xl border border-dark-700 bg-dark-800 py-1 shadow-xl">
<button
onClick={selectAll}
className={`flex w-full items-center gap-2 px-3 py-2 text-left text-xs transition-colors hover:bg-dark-700 ${
allSelected ? 'text-accent-400' : 'text-dark-300'
}`}
>
<Checkbox checked={allSelected} />
{t('admin.trafficUsage.allNodes')}
</button>
<div className="mx-2 border-t border-dark-700" />
<div className="max-h-48 overflow-y-auto">
{available.map((node) => (
<button
key={node.node_uuid}
onClick={() => toggle(node.node_uuid)}
className="flex w-full items-center gap-2 px-3 py-2 text-left text-xs text-dark-300 transition-colors hover:bg-dark-700"
>
<Checkbox checked={selected.has(node.node_uuid)} />
{getFlagEmoji(node.country_code)} {node.node_name}
</button>
))}
</div>
</div>
)}
</div>
);
}
function StatusFilter({
available,
selected,
onChange,
}: {
available: string[];
selected: Set<string>;
onChange: (next: Set<string>) => void;
}) {
const { t } = useTranslation();
const [open, setOpen] = useState(false);
const ref = useRef<HTMLDivElement>(null);
useEffect(() => {
const handler = (e: MouseEvent) => {
if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false);
};
document.addEventListener('mousedown', handler);
return () => document.removeEventListener('mousedown', handler);
}, []);
if (available.length === 0) return null;
const allSelected = selected.size === 0;
const activeCount = selected.size;
const statusLabels: Record<string, string> = {
active: t('admin.trafficUsage.statusActive'),
trial: t('admin.trafficUsage.statusTrial'),
expired: t('admin.trafficUsage.statusExpired'),
disabled: t('admin.trafficUsage.statusDisabled'),
};
const toggle = (status: string) => {
const next = new Set(selected);
if (next.has(status)) {
next.delete(status);
} else {
next.add(status);
}
onChange(next);
};
const selectAll = () => onChange(new Set());
return (
<div className="relative" ref={ref}>
<button
onClick={() => setOpen(!open)}
className={`flex items-center gap-1.5 rounded-lg border px-3 py-1.5 text-xs font-medium transition-colors ${
activeCount > 0
? 'border-accent-500/50 bg-accent-500/10 text-accent-400'
: 'border-dark-700 bg-dark-800 text-dark-200 hover:border-dark-600 hover:bg-dark-700'
}`}
>
<FilterIcon />
{t('admin.trafficUsage.status')}
{activeCount > 0 && (
<span className="rounded-full bg-accent-500 px-1.5 text-[10px] text-white">
{activeCount}
</span>
)}
<ChevronDownIcon />
</button>
{open && (
<div className="absolute left-0 top-full z-30 mt-1 w-56 rounded-xl border border-dark-700 bg-dark-800 py-1 shadow-xl">
<button
onClick={selectAll}
className={`flex w-full items-center gap-2 px-3 py-2 text-left text-xs transition-colors hover:bg-dark-700 ${
allSelected ? 'text-accent-400' : 'text-dark-300'
}`}
>
<Checkbox checked={allSelected} />
{t('admin.trafficUsage.allStatuses')}
</button>
<div className="mx-2 border-t border-dark-700" />
<div className="max-h-48 overflow-y-auto">
{available.map((status) => (
<button
key={status}
onClick={() => toggle(status)}
className="flex w-full items-center gap-2 px-3 py-2 text-left text-xs text-dark-300 transition-colors hover:bg-dark-700"
>
<Checkbox checked={selected.has(status)} />
<StatusDot status={status} />
{statusLabels[status] || status}
</button>
))}
{available.map((tariff) => {
const checked = selected.has(tariff);
return (
<button
key={tariff}
onClick={() => toggle(tariff)}
className="flex w-full items-center gap-2 px-3 py-2 text-left text-xs text-dark-300 transition-colors hover:bg-dark-700"
>
<span
className={`flex h-4 w-4 shrink-0 items-center justify-center rounded border ${
checked ? 'border-accent-500 bg-accent-500' : 'border-dark-600'
}`}
>
{checked && (
<svg
className="h-3 w-3 text-white"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={3}
>
<path
strokeLinecap="round"
strokeLinejoin="round"
d="M4.5 12.75l6 6 9-13.5"
/>
</svg>
)}
</span>
{tariff}
</button>
);
})}
</div>
</div>
)}
@@ -644,20 +356,13 @@ export default function AdminTrafficUsage() {
const [items, setItems] = useState<UserTrafficItem[]>([]);
const [nodes, setNodes] = useState<TrafficNodeInfo[]>([]);
const [allNodes, setAllNodes] = useState<TrafficNodeInfo[]>([]);
const [availableTariffs, setAvailableTariffs] = useState<string[]>([]);
const [availableStatuses, setAvailableStatuses] = useState<string[]>([]);
const [loading, setLoading] = useState(false);
const [initialLoading, setInitialLoading] = useState(true);
const [period, setPeriod] = useState(30);
const [searchInput, setSearchInput] = useState('');
const [committedSearch, setCommittedSearch] = useState('');
const [selectedTariffs, setSelectedTariffs] = useState<Set<string>>(new Set());
const [selectedNodes, setSelectedNodes] = useState<Set<string>>(new Set());
const [selectedStatuses, setSelectedStatuses] = useState<Set<string>>(new Set());
const [dateMode, setDateMode] = useState(false);
const [customStart, setCustomStart] = useState('');
const [customEnd, setCustomEnd] = useState('');
const [offset, setOffset] = useState(0);
const [total, setTotal] = useState(0);
const [exporting, setExporting] = useState(false);
@@ -671,36 +376,18 @@ export default function AdminTrafficUsage() {
const sortBy = sorting[0] ? toBackendSortField(sorting[0].id) : 'total_bytes';
const sortDesc = sorting[0]?.desc ?? true;
const tariffsParam = selectedTariffs.size > 0 ? [...selectedTariffs].join(',') : undefined;
const nodesParam = selectedNodes.size > 0 ? [...selectedNodes].join(',') : undefined;
const statusesParam = selectedStatuses.size > 0 ? [...selectedStatuses].join(',') : undefined;
const buildParams = useCallback(
(): TrafficParams => ({
period: dateMode ? undefined : period,
period,
limit,
offset,
search: committedSearch || undefined,
sort_by: sortBy,
sort_desc: sortDesc,
tariffs: tariffsParam,
nodes: nodesParam,
statuses: statusesParam,
start_date: dateMode && customStart ? customStart : undefined,
end_date: dateMode && customEnd ? customEnd : undefined,
}),
[
period,
offset,
committedSearch,
sortBy,
sortDesc,
tariffsParam,
nodesParam,
statusesParam,
dateMode,
customStart,
customEnd,
],
[period, offset, committedSearch, sortBy, sortDesc, tariffsParam],
);
const applyData = useCallback(
@@ -709,13 +396,11 @@ export default function AdminTrafficUsage() {
nodes: TrafficNodeInfo[];
total: number;
available_tariffs: string[];
available_statuses: string[];
}) => {
setItems(data.items);
setNodes(data.nodes);
setTotal(data.total);
setAvailableTariffs(data.available_tariffs);
setAvailableStatuses(data.available_statuses);
},
[],
);
@@ -724,9 +409,6 @@ export default function AdminTrafficUsage() {
async (skipCache = false) => {
const params = buildParams();
// In date mode, require both dates
if (dateMode && (!customStart || !customEnd)) return;
// Check cache first — apply instantly without any loading state
if (!skipCache) {
const cached = adminTrafficApi.getCached(params);
@@ -748,7 +430,7 @@ export default function AdminTrafficUsage() {
setInitialLoading(false);
}
},
[buildParams, applyData, dateMode, customStart, customEnd],
[buildParams, applyData],
);
// Load on param change
@@ -756,36 +438,8 @@ export default function AdminTrafficUsage() {
loadData();
}, [loadData]);
// Track all available nodes (before node filtering) — fetch once on mount with default params
// Prefetch adjacent periods in background
useEffect(() => {
const fetchAllNodes = async () => {
const params: TrafficParams = {
period: 30,
limit: 1,
offset: 0,
sort_by: 'total_bytes',
sort_desc: true,
};
try {
const data = await adminTrafficApi.getTrafficUsage(params);
setAllNodes(data.nodes);
} catch {
// ignore
}
};
fetchAllNodes();
}, []);
// Update allNodes when we get unfiltered response
useEffect(() => {
if (selectedNodes.size === 0 && nodes.length > 0) {
setAllNodes(nodes);
}
}, [nodes, selectedNodes.size]);
// Prefetch adjacent periods in background (only in period mode)
useEffect(() => {
if (dateMode) return;
const prefetchPeriods = PERIODS.filter((p) => p !== period);
const timer = setTimeout(() => {
prefetchPeriods.forEach((p) => {
@@ -802,7 +456,8 @@ export default function AdminTrafficUsage() {
});
}, 500);
return () => clearTimeout(timer);
}, [period, dateMode]);
// Only prefetch once on mount + when period changes
}, [period]);
useEffect(() => {
if (toast) {
@@ -820,15 +475,7 @@ export default function AdminTrafficUsage() {
const handleExport = async () => {
try {
setExporting(true);
await adminTrafficApi.exportCsv({
period,
start_date: dateMode && customStart ? customStart : undefined,
end_date: dateMode && customEnd ? customEnd : undefined,
tariffs: tariffsParam,
nodes: nodesParam,
statuses: statusesParam,
search: committedSearch || undefined,
});
await adminTrafficApi.exportCsv({ period });
setToast({ message: t('admin.trafficUsage.exportSuccess'), type: 'success' });
} catch {
setToast({ message: t('admin.trafficUsage.exportError'), type: 'error' });
@@ -853,41 +500,10 @@ export default function AdminTrafficUsage() {
setOffset(0);
};
const handleNodeChange = (next: Set<string>) => {
setSelectedNodes(next);
setOffset(0);
};
const handleStatusChange = (next: Set<string>) => {
setSelectedStatuses(next);
setOffset(0);
};
const handleRefresh = () => {
loadData(true);
};
const handleToggleDateMode = () => {
if (!dateMode) {
const today = new Date();
const weekAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000);
setCustomStart(formatDateForInput(weekAgo));
setCustomEnd(formatDateForInput(today));
}
setDateMode(!dateMode);
setOffset(0);
};
const handleCustomStartChange = (v: string) => {
setCustomStart(v);
setOffset(0);
};
const handleCustomEndChange = (v: string) => {
setCustomEnd(v);
setOffset(0);
};
const columns = useMemo<ColumnDef<UserTrafficItem>[]>(() => {
const cols: ColumnDef<UserTrafficItem>[] = [
{
@@ -928,26 +544,15 @@ export default function AdminTrafficUsage() {
),
},
{
id: 'device_limit',
accessorFn: (row) => row.device_limit,
accessorKey: 'device_limit',
header: t('admin.trafficUsage.devices'),
enableSorting: true,
size: 80,
minSize: 60,
meta: { align: 'center' as const },
cell: ({ row }) => {
const item = row.original;
const connected = item.connected_devices;
const limit = item.device_limit;
return (
<span className="text-xs">
<span className={connected > 0 ? 'text-accent-400' : 'text-dark-500'}>
{connected}
</span>
<span className="text-dark-500">/{limit}</span>
</span>
);
},
cell: ({ getValue }) => (
<span className="text-xs text-dark-300">{getValue() as number}</span>
),
},
{
accessorKey: 'traffic_limit_gb',
@@ -1062,34 +667,16 @@ export default function AdminTrafficUsage() {
{/* Controls */}
<div className="mb-4 flex flex-col gap-3">
<div className="flex flex-wrap items-center gap-3">
{dateMode ? (
<DateRangePicker
startDate={customStart}
endDate={customEnd}
onStartChange={handleCustomStartChange}
onEndChange={handleCustomEndChange}
onClose={handleToggleDateMode}
/>
) : (
<PeriodSelector
value={period}
onChange={handlePeriodChange}
label={t('admin.trafficUsage.period')}
dateMode={dateMode}
onToggleDateMode={handleToggleDateMode}
/>
)}
<PeriodSelector
value={period}
onChange={handlePeriodChange}
label={t('admin.trafficUsage.period')}
/>
<TariffFilter
available={availableTariffs}
selected={selectedTariffs}
onChange={handleTariffChange}
/>
<NodeFilter available={allNodes} selected={selectedNodes} onChange={handleNodeChange} />
<StatusFilter
available={availableStatuses}
selected={selectedStatuses}
onChange={handleStatusChange}
/>
<button
onClick={handleExport}
disabled={exporting}