From 56a283950480c34b7b4646545a46d2cb265c8915 Mon Sep 17 00:00:00 2001 From: "kasia.oczkowska" Date: Mon, 31 Mar 2025 15:21:42 +0100 Subject: [PATCH] feat: prevent adding connection when app is disabled --- packages/web/src/components/AddAppConnection/index.jsx | 4 +++- packages/web/src/components/AppConnections/index.jsx | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/web/src/components/AddAppConnection/index.jsx b/packages/web/src/components/AddAppConnection/index.jsx index 0744dd8a..c677c7c9 100644 --- a/packages/web/src/components/AddAppConnection/index.jsx +++ b/packages/web/src/components/AddAppConnection/index.jsx @@ -15,6 +15,7 @@ import * as URLS from 'config/urls'; import useAuthenticateApp from 'hooks/useAuthenticateApp.ee'; import useFormatMessage from 'hooks/useFormatMessage'; import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar'; +import useAppConfig from 'hooks/useAppConfig.ee'; import { generateExternalLink } from 'helpers/translationValues'; import { Form } from './style'; import useAppAuth from 'hooks/useAppAuth'; @@ -41,6 +42,7 @@ function AddAppConnection(props) { }); const queryClient = useQueryClient(); const enqueueSnackbar = useEnqueueSnackbar(); + const { data: appConfig } = useAppConfig(key); React.useEffect(function relayProviderData() { if (window.opener) { @@ -170,7 +172,7 @@ function AddAppConnection(props) { color="primary" sx={{ boxShadow: 2 }} loading={inProgress} - disabled={!authenticate} + disabled={!authenticate || appConfig?.data?.disabled === true} data-test="create-connection-button" > {formatMessage('addAppConnection.submit')} diff --git a/packages/web/src/components/AppConnections/index.jsx b/packages/web/src/components/AppConnections/index.jsx index 32a71346..2bc6e83c 100644 --- a/packages/web/src/components/AppConnections/index.jsx +++ b/packages/web/src/components/AppConnections/index.jsx @@ -5,6 +5,7 @@ import AppConnectionRow from 'components/AppConnectionRow'; import NoResultFound from 'components/NoResultFound'; import Can from 'components/Can'; import useFormatMessage from 'hooks/useFormatMessage'; +import useAppConfig from 'hooks/useAppConfig.ee'; import * as URLS from 'config/urls'; import useAppConnections from 'hooks/useAppConnections'; @@ -12,6 +13,8 @@ function AppConnections(props) { const { appKey } = props; const formatMessage = useFormatMessage(); const { data } = useAppConnections(appKey); + const { data: appConfig } = useAppConfig(appKey); + const appConnections = data?.data || []; const hasConnections = appConnections?.length; @@ -22,7 +25,10 @@ function AppConnections(props) { )}