From efca40d9c8324760225e934c20d26e9b73da8a56 Mon Sep 17 00:00:00 2001 From: Fringg Date: Fri, 24 Apr 2026 07:08:40 +0300 Subject: [PATCH] fix: multi-tariff filter shows all users when >1 tariffs selected Server only supports single tariff_id filter. When multiple tariffs are selected, apply client-side filtering to hide users who have no subscriptions matching any of the selected tariffs. --- src/pages/AdminBulkActions.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/pages/AdminBulkActions.tsx b/src/pages/AdminBulkActions.tsx index c1b1530..5daaaff 100644 --- a/src/pages/AdminBulkActions.tsx +++ b/src/pages/AdminBulkActions.tsx @@ -1977,8 +1977,18 @@ export default function AdminBulkActions() { [t, formatWithCurrency, expandedRows, toggleExpandRow, getFilteredSubs], ); + // When multiple tariffs are selected, filter users client-side + // (server only supports single tariff_id filter) + const filteredUsers = useMemo(() => { + if (tariffFilter.length <= 1) return users; + return users.filter((u) => { + const subs = u.subscriptions ?? []; + return subs.some((s) => s.tariff_id !== null && tariffFilter.includes(s.tariff_id)); + }); + }, [users, tariffFilter]); + const table = useReactTable({ - data: users, + data: filteredUsers, columns, state: { rowSelection }, onRowSelectionChange: setRowSelection,