From 8b1ed54d5455aca3d7f8ffd99ad6c41c9a99ee54 Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Tue, 1 Apr 2025 13:56:28 +0000 Subject: [PATCH] feat(web): use new manage permission in checks --- .../src/components/AdminSettingsLayout/index.jsx | 14 +++++++------- packages/web/src/components/FlowsButtons/index.jsx | 2 +- packages/web/src/pages/Application/index.jsx | 4 ++-- packages/web/src/pages/CreateUser/index.jsx | 2 +- packages/web/src/pages/EditUser/index.jsx | 2 +- packages/web/src/pages/Flows/index.jsx | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/web/src/components/AdminSettingsLayout/index.jsx b/packages/web/src/components/AdminSettingsLayout/index.jsx index 29351314..e8aad6e1 100644 --- a/packages/web/src/components/AdminSettingsLayout/index.jsx +++ b/packages/web/src/components/AdminSettingsLayout/index.jsx @@ -93,15 +93,15 @@ function SettingsLayout() { const closeDrawer = () => setDrawerOpen(false); const drawerLinks = createDrawerLinks({ - canCreateFlows: currentUserAbility.can('create', 'Flow'), + canCreateFlows: currentUserAbility.can('manage', 'Flow'), canReadUser: currentUserAbility.can('read', 'User'), canReadRole: currentUserAbility.can('read', 'Role'), - canUpdateConfig: currentUserAbility.can('update', 'Config'), - canManageSamlAuthProvider: - currentUserAbility.can('read', 'SamlAuthProvider') && - currentUserAbility.can('update', 'SamlAuthProvider') && - currentUserAbility.can('create', 'SamlAuthProvider'), - canUpdateApp: currentUserAbility.can('update', 'App'), + canUpdateConfig: currentUserAbility.can('manage', 'Config'), + canManageSamlAuthProvider: currentUserAbility.can( + 'manage', + 'SamlAuthProvider', + ), + canUpdateApp: currentUserAbility.can('manage', 'App'), }); const drawerBottomLinks = [ diff --git a/packages/web/src/components/FlowsButtons/index.jsx b/packages/web/src/components/FlowsButtons/index.jsx index 44abf690..b3a6c4f8 100644 --- a/packages/web/src/components/FlowsButtons/index.jsx +++ b/packages/web/src/components/FlowsButtons/index.jsx @@ -19,7 +19,7 @@ export default function FlowsButtons() { const theme = useTheme(); const { data: config } = useAutomatischConfig(); const matchSmallScreens = useMediaQuery(theme.breakpoints.down('md')); - const canCreateFlow = currentUserAbility.can('create', 'Flow'); + const canCreateFlow = currentUserAbility.can('manage', 'Flow'); const enableTemplates = config?.data.enableTemplates === true; const createFlowButtonData = { diff --git a/packages/web/src/pages/Application/index.jsx b/packages/web/src/pages/Application/index.jsx index 0ba6ab62..7ef8683a 100644 --- a/packages/web/src/pages/Application/index.jsx +++ b/packages/web/src/pages/Application/index.jsx @@ -81,7 +81,7 @@ export default function Application() { 'data-test': 'add-connection-button', to: URLS.APP_ADD_CONNECTION(appKey, false), disabled: - !currentUserAbility.can('create', 'Connection') || + !currentUserAbility.can('manage', 'Connection') || appConfig?.data?.useOnlyPredefinedAuthClients === true || appConfig?.data?.disabled === true, }; @@ -92,7 +92,7 @@ export default function Application() { 'data-test': 'add-connection-with-auth-client-button', to: URLS.APP_ADD_CONNECTION(appKey, true), disabled: - !currentUserAbility.can('create', 'Connection') || + !currentUserAbility.can('manage', 'Connection') || appOAuthClients?.data?.length === 0 || appConfig?.data?.disabled === true, }; diff --git a/packages/web/src/pages/CreateUser/index.jsx b/packages/web/src/pages/CreateUser/index.jsx index 5eb04376..b0afe719 100644 --- a/packages/web/src/pages/CreateUser/index.jsx +++ b/packages/web/src/pages/CreateUser/index.jsx @@ -67,7 +67,7 @@ export default function CreateUser() { const roles = rolesData?.data; const queryClient = useQueryClient(); const currentUserAbility = useCurrentUserAbility(); - const canUpdateRole = currentUserAbility.can('update', 'Role'); + const canUpdateRole = currentUserAbility.can('manage', 'Role'); const handleUserCreation = async (userData) => { try { diff --git a/packages/web/src/pages/EditUser/index.jsx b/packages/web/src/pages/EditUser/index.jsx index 28713ece..e2e06db1 100644 --- a/packages/web/src/pages/EditUser/index.jsx +++ b/packages/web/src/pages/EditUser/index.jsx @@ -73,7 +73,7 @@ export default function EditUser() { const enqueueSnackbar = useEnqueueSnackbar(); const navigate = useNavigate(); const currentUserAbility = useCurrentUserAbility(); - const canUpdateRole = currentUserAbility.can('update', 'Role'); + const canUpdateRole = currentUserAbility.can('manage', 'Role'); const handleUserUpdate = async (userDataToUpdate) => { try { diff --git a/packages/web/src/pages/Flows/index.jsx b/packages/web/src/pages/Flows/index.jsx index 2fc5da75..21e03a35 100644 --- a/packages/web/src/pages/Flows/index.jsx +++ b/packages/web/src/pages/Flows/index.jsx @@ -168,7 +168,7 @@ export default function Flows() { {!isLoading && !navigateToLastPage && !hasFlows && (