roles update
This commit is contained in:
lendry
@@ -11,7 +11,7 @@ import { Button } from '@/components/ui/button';
|
||||
import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
|
||||
import { AdminRole, AdminUser, apiFetch } from '@/lib/api';
|
||||
import { AdminPermission, AdminRole, AdminUser, apiFetch } from '@/lib/api';
|
||||
import { getAdminLandingPath } from '@/lib/admin-access';
|
||||
|
||||
const statusLabels: Record<string, string> = {
|
||||
@@ -21,18 +21,22 @@ const statusLabels: Record<string, string> = {
|
||||
};
|
||||
|
||||
const roleLabels: Record<string, string> = {
|
||||
user: 'Пользователь',
|
||||
admin: 'Администратор',
|
||||
moderator: 'Модератор',
|
||||
manager: 'Менеджер',
|
||||
'super-admin': 'Супер-админ'
|
||||
};
|
||||
|
||||
const DEFAULT_USER_ROLE = 'user';
|
||||
|
||||
export default function AdminUsersPage() {
|
||||
const router = useRouter();
|
||||
const { token, user: currentUser } = useAuth();
|
||||
const { showToast } = useToast();
|
||||
const [users, setUsers] = useState<AdminUser[]>([]);
|
||||
const [roles, setRoles] = useState<AdminRole[]>([]);
|
||||
const [permissions, setPermissions] = useState<AdminPermission[]>([]);
|
||||
const [search, setSearch] = useState('');
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [selectedUser, setSelectedUser] = useState<AdminUser | null>(null);
|
||||
@@ -68,12 +72,26 @@ export default function AdminUsersPage() {
|
||||
|
||||
useEffect(() => {
|
||||
if (!token || !currentUser?.canManageRoles) return;
|
||||
apiFetch<{ roles: AdminRole[] }>('/admin/rbac/roles', {}, token)
|
||||
.then((response) => setRoles(response.roles ?? []))
|
||||
Promise.all([
|
||||
apiFetch<{ roles: AdminRole[] }>('/admin/rbac/roles', {}, token),
|
||||
apiFetch<{ permissions: AdminPermission[] }>('/admin/rbac/permissions', {}, token)
|
||||
])
|
||||
.then(([rolesResponse, permissionsResponse]) => {
|
||||
setRoles(rolesResponse.roles ?? []);
|
||||
setPermissions(permissionsResponse.permissions ?? []);
|
||||
})
|
||||
.catch(() => undefined);
|
||||
}, [currentUser?.canManageRoles, token]);
|
||||
|
||||
const assignableRoles = useMemo(() => roles.filter((role) => role.slug !== 'super-admin'), [roles]);
|
||||
const assignableRoles = useMemo(
|
||||
() => roles.filter((role) => role.slug !== 'super-admin' && !role.isDefault),
|
||||
[roles]
|
||||
);
|
||||
|
||||
const permissionLabelBySlug = useMemo(
|
||||
() => Object.fromEntries(permissions.map((permission) => [permission.slug, permission.name])),
|
||||
[permissions]
|
||||
);
|
||||
|
||||
async function handleSuspend(user: AdminUser) {
|
||||
if (!token) return;
|
||||
@@ -171,11 +189,52 @@ export default function AdminUsersPage() {
|
||||
}
|
||||
}
|
||||
|
||||
async function handleAssignPermission(permissionSlug: string) {
|
||||
if (!token || !selectedUser) return;
|
||||
setActionLoading(true);
|
||||
try {
|
||||
const response = await apiFetch<{ permissions: string[] }>(`/admin/rbac/users/${selectedUser.id}/permissions`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ permissionSlug })
|
||||
}, token);
|
||||
setSelectedUser({ ...selectedUser, directPermissions: response.permissions ?? [] });
|
||||
showToast('Право назначено');
|
||||
await loadUsers();
|
||||
} catch (error) {
|
||||
showToast(error instanceof Error ? error.message : 'Не удалось назначить право');
|
||||
} finally {
|
||||
setActionLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleRemovePermission(permissionSlug: string) {
|
||||
if (!token || !selectedUser) return;
|
||||
setActionLoading(true);
|
||||
try {
|
||||
const response = await apiFetch<{ permissions: string[] }>(`/admin/rbac/users/${selectedUser.id}/permissions/${permissionSlug}`, {
|
||||
method: 'DELETE'
|
||||
}, token);
|
||||
setSelectedUser({ ...selectedUser, directPermissions: response.permissions ?? [] });
|
||||
showToast('Право снято');
|
||||
await loadUsers();
|
||||
} catch (error) {
|
||||
showToast(error instanceof Error ? error.message : 'Не удалось снять право');
|
||||
} finally {
|
||||
setActionLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
function renderRoles(user: AdminUser) {
|
||||
const userRoles = user.roles ?? [];
|
||||
const labels = user.isSuperAdmin ? ['Супер-админ', ...userRoles.map((role) => roleLabels[role] ?? role)] : userRoles.map((role) => roleLabels[role] ?? role);
|
||||
if (!labels.length) return 'Пользователь';
|
||||
return labels.join(', ');
|
||||
const extraRoles = userRoles.filter((role) => role !== DEFAULT_USER_ROLE);
|
||||
const direct = user.directPermissions ?? [];
|
||||
const labels = user.isSuperAdmin
|
||||
? ['Супер-админ', ...extraRoles.map((role) => roleLabels[role] ?? role)]
|
||||
: extraRoles.map((role) => roleLabels[role] ?? role);
|
||||
const directLabels = direct.map((slug) => permissionLabelBySlug[slug] ?? slug);
|
||||
const parts = [...labels, ...directLabels.map((label) => `+ ${label}`)];
|
||||
if (!parts.length) return roleLabels.user;
|
||||
return parts.join(', ');
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -312,10 +371,14 @@ export default function AdminUsersPage() {
|
||||
<div className="space-y-2">
|
||||
{(selectedUser?.roles ?? []).map((role) => (
|
||||
<div key={role} className="flex items-center justify-between rounded-xl bg-[#f4f5f8] px-3 py-2">
|
||||
<span>{roleLabels[role] ?? role}</span>
|
||||
<Button variant="ghost" size="sm" disabled={actionLoading} onClick={() => void handleRemoveRole(role)}>
|
||||
Снять
|
||||
</Button>
|
||||
<span>{roleLabels[role] ?? role}{role === DEFAULT_USER_ROLE ? ' (стандартная)' : ''}</span>
|
||||
{role === DEFAULT_USER_ROLE ? (
|
||||
<span className="text-xs text-[#667085]">Нельзя снять</span>
|
||||
) : (
|
||||
<Button variant="ghost" size="sm" disabled={actionLoading} onClick={() => void handleRemoveRole(role)}>
|
||||
Снять
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
{!(selectedUser?.roles ?? []).length ? <p className="text-sm text-[#667085]">Роли не назначены</p> : null}
|
||||
@@ -335,6 +398,37 @@ export default function AdminUsersPage() {
|
||||
</Button>
|
||||
))}
|
||||
</div>
|
||||
<div className="mt-6 space-y-2 border-t border-[#eceef4] pt-4">
|
||||
<p className="text-sm font-medium">Прямые права</p>
|
||||
<p className="text-xs text-[#667085]">Дополнительные permissions без смены роли. Например, oauth.manage для одного пользователя.</p>
|
||||
{(selectedUser?.directPermissions ?? []).map((permissionSlug) => (
|
||||
<div key={permissionSlug} className="flex items-center justify-between rounded-xl bg-[#eef4ff] px-3 py-2">
|
||||
<span className="text-sm">{permissionLabelBySlug[permissionSlug] ?? permissionSlug}</span>
|
||||
<Button variant="ghost" size="sm" disabled={actionLoading} onClick={() => void handleRemovePermission(permissionSlug)}>
|
||||
Снять
|
||||
</Button>
|
||||
</div>
|
||||
))}
|
||||
{!(selectedUser?.directPermissions ?? []).length ? (
|
||||
<p className="text-sm text-[#667085]">Прямые права не назначены</p>
|
||||
) : null}
|
||||
<div className="max-h-48 space-y-1 overflow-y-auto pt-2">
|
||||
{permissions
|
||||
.filter((permission) => !(selectedUser?.directPermissions ?? []).includes(permission.slug))
|
||||
.map((permission) => (
|
||||
<Button
|
||||
key={permission.id}
|
||||
variant="secondary"
|
||||
size="sm"
|
||||
className="w-full justify-start"
|
||||
disabled={actionLoading}
|
||||
onClick={() => void handleAssignPermission(permission.slug)}
|
||||
>
|
||||
+ {permission.name}
|
||||
</Button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user