mirror of
https://github.com/MODSetter/SurfSense.git
synced 2026-07-10 22:32:16 +02:00
fix: complete usePermissions migration to permissionsAtom in team page
This commit is contained in:
parent
b4cdf2dcc1
commit
55d204e05b
1 changed files with 15 additions and 2 deletions
|
|
@ -48,6 +48,7 @@ import { toast } from "sonner";
|
||||||
import { createRoleMutationAtom, updateRoleMutationAtom, deleteRoleMutationAtom } from "@/atoms/roles/roles-mutation.atoms";
|
import { createRoleMutationAtom, updateRoleMutationAtom, deleteRoleMutationAtom } from "@/atoms/roles/roles-mutation.atoms";
|
||||||
import { useAtomValue } from "jotai";
|
import { useAtomValue } from "jotai";
|
||||||
import type { CreateRoleRequest, UpdateRoleRequest, DeleteRoleRequest } from "@/contracts/types/roles.types";
|
import type { CreateRoleRequest, UpdateRoleRequest, DeleteRoleRequest } from "@/contracts/types/roles.types";
|
||||||
|
import { permissionsAtom } from "@/atoms/permissions/permissions-query.atoms";
|
||||||
import { rolesApiService } from "@/lib/apis/roles-api.service";
|
import { rolesApiService } from "@/lib/apis/roles-api.service";
|
||||||
import { cacheKeys } from "@/lib/query-client/cache-keys";
|
import { cacheKeys } from "@/lib/query-client/cache-keys";
|
||||||
import {
|
import {
|
||||||
|
|
@ -112,7 +113,6 @@ import {
|
||||||
type Role,
|
type Role,
|
||||||
useInvites,
|
useInvites,
|
||||||
useMembers,
|
useMembers,
|
||||||
usePermissions,
|
|
||||||
useUserAccess,
|
useUserAccess,
|
||||||
} from "@/hooks/use-rbac";
|
} from "@/hooks/use-rbac";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
@ -210,7 +210,20 @@ export default function TeamManagementPage() {
|
||||||
createInvite,
|
createInvite,
|
||||||
revokeInvite,
|
revokeInvite,
|
||||||
} = useInvites(searchSpaceId);
|
} = useInvites(searchSpaceId);
|
||||||
const { groupedPermissions, loading: permissionsLoading } = usePermissions();
|
|
||||||
|
const { data: permissionsData, isLoading: permissionsLoading } = useAtomValue(permissionsAtom);
|
||||||
|
const permissions = permissionsData?.permissions || [];
|
||||||
|
const groupedPermissions = useMemo(() => {
|
||||||
|
const grouped: Record<string, typeof permissions> = {};
|
||||||
|
permissions.forEach((permission) => {
|
||||||
|
const category = permission.permission_name.split(":")[0];
|
||||||
|
if (!grouped[category]) {
|
||||||
|
grouped[category] = [];
|
||||||
|
}
|
||||||
|
grouped[category].push(permission);
|
||||||
|
});
|
||||||
|
return grouped;
|
||||||
|
}, [permissions]);
|
||||||
|
|
||||||
const canManageMembers = hasPermission("members:view");
|
const canManageMembers = hasPermission("members:view");
|
||||||
const canManageRoles = hasPermission("roles:read");
|
const canManageRoles = hasPermission("roles:read");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue