From ee66e7cc95c3e6e48af86ebdf3ad8af47514dddf Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Fri, 23 Jun 2023 15:21:16 +0200 Subject: [PATCH] Fix: Fix SSO setting page permissions --- .../SettingsPage/pages/SingleSignOn/index.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js index a91f097f9d..75706e9985 100644 --- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js +++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js @@ -38,13 +38,18 @@ export const SingleSignOn = () => { const { formatMessage } = useIntl(); const permissions = useSelector(selectAdminPermissions); + // TODO: this is necessary because otherwise we run into an + // infinite rendering loop + const permissionsMemoized = React.useMemo(() => { + return { + ...permissions.settings.sso, + readRoles: permissions.settings.roles.read, + }; + }, [permissions.settings.roles.read, permissions.settings.sso]); const { isLoading: isLoadingForPermissions, allowedActions: { canUpdate, canReadRoles }, - } = useRBAC({ - ...permissions.settings.sso, - readRoles: permissions.settings.roles.read, - }); + } = useRBAC(permissionsMemoized); const [ { formErrors, initialData, isLoading, modifiedData, showHeaderButtonLoader }, @@ -251,7 +256,7 @@ const ProtectedSSO = () => { const permissions = useSelector(selectAdminPermissions); return ( - + );