-
{profile?.login}
+{profile?.name}
{profile?.email}
+
+ );
+};
+
+export default ApiKeysTab;
diff --git a/src/views/settings/ui/RolesPermissionsTab.tsx b/src/views/settings/ui/RolesPermissionsTab.tsx
new file mode 100644
index 00000000..b77d6cd0
--- /dev/null
+++ b/src/views/settings/ui/RolesPermissionsTab.tsx
@@ -0,0 +1,1106 @@
+'use client';
+
+import React, { useEffect, useMemo, useState } from 'react';
+import { MoreVertical, Pencil, RefreshCw, Trash } from 'lucide-react';
+
+import { PermissionDto, rbacApi, RbacUser, RoleDto, RoleWithPerms } from '@/shared/api/rbac';
+import { Button } from '@/shared/ui/button';
+import { Input } from '@/shared/ui/input';
+import { Label } from '@/shared/ui/label';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/shared/ui/table';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/shared/ui/tabs';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/shared/ui/dropdown-menu';
+import { Badge } from '@/shared/ui/badge';
+import { Checkbox } from '@/shared/ui/checkbox';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/shared/ui/tooltip';
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from '@/shared/ui/dialog';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/shared/ui/select';
+
+const emptyRole: Omit
+
+ Права роли: {roleName}
+ {perms.length ? (
+ -
+ {perms.map((p) => (
+
- {p.name} + ))} +
Нет прав
+ )}
+
+
+
+ Пользователи
+ Роли
+ Права
+ Матрица
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/src/views/settings/ui/Settings.tsx b/src/views/settings/ui/Settings.tsx
index 45a2d4c9..83da8851 100644
--- a/src/views/settings/ui/Settings.tsx
+++ b/src/views/settings/ui/Settings.tsx
@@ -1,5 +1,10 @@
+'use client';
+
import React from 'react';
+import { RolesPermissionsTab } from './RolesPermissionsTab';
+import { ApiKeysTab } from './ApiKeysTab';
+
import { EditSettingsPlatformForm } from '@/features/edit-settings-platform-form';
import { Breadcrumbs } from '@/shared/ui/Breadcrumbs';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/shared/ui/tabs';
@@ -15,7 +20,7 @@ export const SettingsPage = () => {
+
+ Пользователи
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Матрица прав
+ +
+
+
+
+ Роли
+
+
+ Управление ролями
+
+
+ {roles.map((r) => (
+
+
+
+
+
+
+
+
+
+
+
+ {
+ if (isAdminRole(r)) return;
+ setEditingRole(r);
+ setRoleForm({ name: r.name, description: r.description ?? '' });
+ setRoleModalOpen(true);
+ }}
+ >
+
+ {
+ if (isAdminRole(r)) return;
+ setRoleToDelete(r);
+ setConfirmOpen(true);
+ }}
+ >
+
+
+
+
+ ))}
+ {!roles.length &&
+
+ {r.name}
+ {r.description && (
+ {r.description}
+ )}
+ Ролей пока нет.
}
+
+
+
+ {/* Groups */}
+ Права
+
+
+
+
+
+ {permsByGroup.map(([group, list]) => (
+
+
+ {/* Create/Edit Permission Modal */}
+
+
+
+ ))}
+ {!perms.length &&
+
+
+ {group}
+ {list.length}
+
+
+ {list.map((p) => (
+
+
+
+
+
+
+
+ {
+ if (isSystemPerm(p)) return;
+ setEditingPerm(p);
+ setPermForm({ name: p.name, description: p.description ?? '' });
+ setPermModalOpen(true);
+ }}
+ >
+
+ {
+ if (!isSystemPerm(p)) deletePerm(p.id);
+ }}
+ >
+
+
+
+
+ ))}
+ {!list.length && (
+
+
+
+
+
+
+ SYSTEM
+
+
+ Системное право. Изменение запрещено.
+
+ )}
+
+ {p.description && (
+ {p.name}
+ {isSystemPerm(p) && (
+ {p.description}
+ )}
+
+ Нет прав в группе.
+
+ )}
+ Прав пока нет.
}
+ Настройки
+
{
Основные
+
+ Роли и права
+
+ Beta
+
+
+ {/**/}
+ {/* Api ключи*/}
+ {/* */}
+
+
+
+
diff --git a/src/widgets/client-hub/lib/useConnectionHub.ts b/src/widgets/client-hub/lib/useConnectionHub.ts
index 79891bcd..aea8d201 100644
--- a/src/widgets/client-hub/lib/useConnectionHub.ts
+++ b/src/widgets/client-hub/lib/useConnectionHub.ts
@@ -42,8 +42,7 @@ export const useConnectionHub = (props: ConnectionHubProps) => {
try {
const connection = new HubConnectionBuilder()
.withUrl(CONNECTION_URL(accessToken), {
- headers: { 'Access-Control-Allow-Credentials': '*' },
- withCredentials: false,
+ withCredentials: true,
})
.withAutomaticReconnect()
.build();
diff --git a/src/widgets/client-hub/ui/ClientState.tsx b/src/widgets/client-hub/ui/ClientState.tsx
index 526fac44..5bd45d46 100644
--- a/src/widgets/client-hub/ui/ClientState.tsx
+++ b/src/widgets/client-hub/ui/ClientState.tsx
@@ -22,10 +22,10 @@ export function ClientState({ state }: ClientStateProps) {
<>
{EntityStateOption[`OPTION_${state}` as keyof typeof EntityStateOption]}
diff --git a/src/widgets/client-hub/ui/DownloadClientHub.tsx b/src/widgets/client-hub/ui/DownloadClientHub.tsx
index d9f0090f..eec4be59 100644
--- a/src/widgets/client-hub/ui/DownloadClientHub.tsx
+++ b/src/widgets/client-hub/ui/DownloadClientHub.tsx
@@ -28,7 +28,6 @@ import {
} from '@/shared/ui/command';
import { Separator } from '@/shared/ui/separator';
import { Popover, PopoverContent, PopoverTrigger } from '@/shared/ui/popover';
-import { useGetJavaVersions } from '@/shared/hooks';
interface DownloadClientHubProps {
profile?: ProfileExtendedBaseEntity;
@@ -57,7 +56,8 @@ export function DownloadClientHub(props: DownloadClientHubProps) {
logs,
} = useConnectionHub(props);
- const javaVersions = useGetJavaVersions();
+ // const javaVersions = useGetJavaVersions();
+ const javaVersions: { data?: JavaVersionBaseEntity[] } = { data: [] };
const form = useForm();
diff --git a/src/widgets/generate-launcher-dialog/lib/hooks/useConnectionHub.ts b/src/widgets/generate-launcher-dialog/lib/hooks/useConnectionHub.ts
index 2bb16364..ddc0b03d 100644
--- a/src/widgets/generate-launcher-dialog/lib/hooks/useConnectionHub.ts
+++ b/src/widgets/generate-launcher-dialog/lib/hooks/useConnectionHub.ts
@@ -37,8 +37,7 @@ export const useConnectionHub = () => {
try {
const connection = new HubConnectionBuilder()
.withUrl(CONNECTION_URL(accessToken), {
- headers: { 'Access-Control-Allow-Credentials': '*' },
- withCredentials: false,
+ withCredentials: true,
})
.withAutomaticReconnect()
.build();
diff --git a/src/widgets/notifications-hub/lib/useConnectionHub.ts b/src/widgets/notifications-hub/lib/useConnectionHub.ts
index f69f8e28..d2635ee4 100644
--- a/src/widgets/notifications-hub/lib/useConnectionHub.ts
+++ b/src/widgets/notifications-hub/lib/useConnectionHub.ts
@@ -33,8 +33,7 @@ export const useConnectionHub = () => {
try {
const connection = new HubConnectionBuilder()
.withUrl(CONNECTION_URL(accessToken), {
- headers: { 'Access-Control-Allow-Credentials': '*' },
- withCredentials: false,
+ withCredentials: true,
})
.withAutomaticReconnect()
.build();
diff --git a/src/widgets/players-table/lib/columns.tsx b/src/widgets/players-table/lib/columns.tsx
index 501b54a2..8b538d04 100644
--- a/src/widgets/players-table/lib/columns.tsx
+++ b/src/widgets/players-table/lib/columns.tsx
@@ -1,18 +1,38 @@
'use client';
-import React from 'react';
+import React, { useMemo, useState } from 'react';
import { createColumnHelper } from '@tanstack/table-core';
import { format } from 'date-fns';
-import { GavelIcon, UserXIcon } from 'lucide-react';
+import { Ban as BanIcon, GavelIcon, MoreVertical, ShieldCheck, Trash, User, Monitor, Laptop, Smartphone, Tablet } from 'lucide-react';
import { DataTableColumnHeader } from '@/entities/Table';
import { PlayerBaseEntity } from '@/shared/api/contracts';
import { $api } from '@/services/api.service';
import { Button } from '@/shared/ui/button';
-import { useBanPlayer, usePardonPlayer, useRemoveUser } from '@/shared/hooks/usePlayers';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/shared/ui/dropdown-menu';
+import {
+ useBanPlayer,
+ useBanPlayerHardware,
+ usePardonPlayer,
+ usePardonPlayerHardware,
+ useRemoveUser,
+} from '@/shared/hooks/usePlayers';
import { Tooltip, TooltipContent, TooltipTrigger } from '@/shared/ui/tooltip';
import { Card, CardDescription, CardHeader, CardTitle } from '@/shared/ui/card';
import { timeAgo } from '@/shared/lib/getFormatDate/getFormatDate';
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+} from '@/shared/ui/dialog';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/shared/ui/tabs';
enum ColumnHeader {
ICON = '',
@@ -21,19 +41,372 @@ enum ColumnHeader {
SESSION_END_DATE = 'Дата завершения сессии',
UUID = 'UUID',
BANNED = 'Заблокирован',
+ BANNED_HARDWARE = 'Заблокирован по железу',
IP_ADDRESS = 'IP Адрес',
ACTIONS = 'Действия',
}
export const columnsHelper = createColumnHelper();
+
+function AvatarCell({ name, uuid }: { name?: string; uuid: string }) {
+ const [error, setError] = useState(false);
+ const initials = useMemo(() => {
+ const n = (name || '').trim();
+ if (!n) return '?';
+ // Use first 2 symbols to match the example; uppercase
+ return n.substring(0, 2).toUpperCase();
+ }, [name]);
+
+ if (error) {
+ return (
+ )
setError(true)}
+ />
+ );
+}
+function PlayerDetailsDialog({
+ player,
+ open,
+ onOpenChange,
+}: {
+ player: PlayerBaseEntity;
+ open: boolean;
+ onOpenChange: (o: boolean) => void;
+}) {
+ const uuid = player.uuid;
+ const sessionDate = player.expiredDate ? new Date(player.expiredDate) : null;
+ const isValidDate = !!(sessionDate && !isNaN(sessionDate.getTime()));
+ const sessionStr = isValidDate ? format(sessionDate as Date, 'dd.MM.yyyy в HH:mm:ss') : '-';
+ const addresses = Array.from(
+ new Set((player.authHistory || []).map((c) => c.address).filter(Boolean)),
+ );
+
+ const getDeviceIcon = (device?: string) => {
+ const d = (device || '').toLowerCase();
+ if (
+ d.includes('phone') ||
+ d.includes('mobile') ||
+ d.includes('android') ||
+ d.includes('iphone') ||
+ d.includes('ios')
+ )
+ return
+
+
+
+
+ setOpen(true)}>
+
+ {isBanned ? (
+ pardonUser(row.original.uuid)}>
+
+ ) : (
+ banUser(row.original.uuid)}>
+
+ )}
+ {isHwPermanent && (
+ pardonUserHardware(row.original.uuid)}>
+
+ )}
+ {!isHwPermanent && (
+ banUserHardware(row.original.uuid)}>
+
+ )}
+ setConfirmOpen(true)}>
+
+
+
+
+ {initials}
+
+ );
+ }
+
+ return (
+
-
-
-
{row.original.name}
+
+ {/* Avatar with fallback to initials if image is missing or fails to load */}
+
);
},
}),
+ // Compact: sign-in count moved into name cell badge above.
+ // Keep column very narrow for sorting but hide content textually.
columnsHelper.accessor('authHistory', {
- size: 100,
+ size: 60,
header: ({ column }) => (
+
+
+
+
+
+ Заблокирован
+
+ ) : (
+
+
+
+
+ Не заблокирован
+
+ )}
+
+
+
+ {authCount}
+
+
+ Авторизаций: {authCount}
+
+ {row.original.isLauncherStarted && (
+
+ + {row.original.name} +
+ {banned ? ( +
+
+ Лаунчер запущен
+
+ )}
+
+ UUID:
+ {uuid}
+
+
+
+
+ );
+ }
+
+ return (
+
+ {isBanned && (
+
+
+
+
+ Блокировка аккаунта
+
+ )}
+ {isHw && (
+
+
+
+
+
+ {isHwPermanent ? 'Перманентная блокировка по железу' : 'Блокировка по железу'}
+
+
+ )}
+
+ {isHw && isBanned
+ ? isHwPermanent
+ ? 'Бан + Железо (перманентно)'
+ : 'Бан + Железо'
+ : isHw
+ ? isHwPermanent
+ ? 'Железо (перманентно)'
+ : 'Железо'
+ : 'Бан'}
+
+
+ );
+ },
}),
columnsHelper.display({
id: 'address',
- size: 100,
+ size: 120,
header: ({ column }) => (
{distinctAddresses.join(', ')}
+
+ {first ?? '-'}
+ {more > 0 && +{more}}
+
@@ -121,44 +637,11 @@ export const useColumns = () => {
}),
columnsHelper.display({
id: 'actions',
- size: 100,
+ size: 64,
header: ({ column }) => (
([]);
const [columnVisibility, setColumnVisibility] = useState({});
@@ -57,31 +88,267 @@ export function PlayersTable() {
}
}, [fetchNextPage, inView]);
+ // Auto-search when user stops typing (debounce)
+ useEffect(() => {
+ const handler = setTimeout(() => {
+ setDebouncedFilters({
+ findName: search.trim() || undefined,
+ findUuid: uuid.trim() || undefined,
+ findIp: ip.trim() || undefined,
+ findHwid: hwid.trim() || undefined,
+ onlyBlocked,
+ onlyDeviceBlocked,
+ sortBy,
+ sortDesc,
+ take,
+ } as any);
+ }, 500);
+ return () => clearTimeout(handler);
+ }, [search, uuid, ip, hwid, onlyBlocked, onlyDeviceBlocked, sortBy, sortDesc, take]);
+
const onSubmit = (event: React.FormEvent) => {
event.preventDefault();
+ setDebouncedFilters({
+ findName: search.trim() || undefined,
+ findUuid: uuid.trim() || undefined,
+ findIp: ip.trim() || undefined,
+ findHwid: hwid.trim() || undefined,
+ onlyBlocked,
+ onlyDeviceBlocked,
+ sortBy,
+ sortDesc,
+ take,
+ } as any);
refetch();
};
return (
<>
- {status === 'pending' ? (
-
- {row.original.isBanned ? (
-
- ) : (
-
- )}
-
-
-
- );
- },
+ cell: ({ row }) =>
-
+ {/* Keep filters always mounted to preserve focus */}
+ {isError && Error: {error.message}}
+
+
+
+
+
+
+
+
+
+
{players && (
@@ -122,7 +389,6 @@ export function PlayersTable() {
)}
- )}
);
}