Merge pull request #2421 from automatisch/AUT-1366
feat: prevent adding connection when app is disabled
This commit is contained in:
@@ -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')}
|
||||
|
||||
@@ -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) {
|
||||
<NoResultFound
|
||||
text={formatMessage('app.noConnections')}
|
||||
data-test="connections-no-results"
|
||||
{...(allowed && { to: URLS.APP_ADD_CONNECTION(appKey) })}
|
||||
{...(allowed &&
|
||||
!appConfig?.data?.disabled && {
|
||||
to: URLS.APP_ADD_CONNECTION(appKey),
|
||||
})}
|
||||
/>
|
||||
)}
|
||||
</Can>
|
||||
|
||||
Reference in New Issue
Block a user