From 03e7a9ca8ca30ef59ccc8b24ebdd99e699abd673 Mon Sep 17 00:00:00 2001 From: Anton Tranelis Date: Tue, 29 Oct 2024 16:19:52 +0100 Subject: [PATCH] updated permission types --- src/Components/Map/hooks/usePermissions.tsx | 8 ++------ src/types.ts | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Components/Map/hooks/usePermissions.tsx b/src/Components/Map/hooks/usePermissions.tsx index cb11a81f..dc607260 100644 --- a/src/Components/Map/hooks/usePermissions.tsx +++ b/src/Components/Map/hooks/usePermissions.tsx @@ -103,11 +103,11 @@ function usePermissionsManager(initialPermissions: Permission[]): { p.action === action && p.collection === collectionName && ( - (p.role === user?.role && + (p.policy === user?.role && ( !item || evaluatePermissions(p.permissions) )) || - (p.role == null && + (p.policy == null && ( (layer?.public_edit_items || item?.layer?.public_edit_items) && (!item || evaluatePermissions(p.permissions)) @@ -116,12 +116,8 @@ function usePermissionsManager(initialPermissions: Permission[]): { ); } }, - // eslint-disable-next-line react-hooks/exhaustive-deps [permissions, user] ); - - - return { permissions, setPermissionApi, setPermissionData, setAdminRole, hasUserPermission }; } diff --git a/src/types.ts b/src/types.ts index 5e80b58f..4ac29c3a 100644 --- a/src/types.ts +++ b/src/types.ts @@ -158,7 +158,7 @@ export type PermissionCondition = { export type Permission = { id?: string; - role: string; + policy: string; collection: string; action: PermissionAction; permissions?: { // Optional, für spezifische Bedingungen wie `user_created`