({
display: 'flex',
flexDirection: 'column',
diff --git a/packages/web/src/components/AdminApplicationAuthClients/index.tsx b/packages/web/src/components/AdminApplicationAuthClients/index.jsx
similarity index 91%
rename from packages/web/src/components/AdminApplicationAuthClients/index.tsx
rename to packages/web/src/components/AdminApplicationAuthClients/index.jsx
index cfa5eadb..f311a548 100644
--- a/packages/web/src/components/AdminApplicationAuthClients/index.tsx
+++ b/packages/web/src/components/AdminApplicationAuthClients/index.jsx
@@ -7,27 +7,16 @@ import CardContent from '@mui/material/CardContent';
import Typography from '@mui/material/Typography';
import Chip from '@mui/material/Chip';
import Button from '@mui/material/Button';
-
import * as URLS from 'config/urls';
import useFormatMessage from 'hooks/useFormatMessage';
import useAppAuthClients from 'hooks/useAppAuthClients.ee';
-
import NoResultFound from 'components/NoResultFound';
-
-type AdminApplicationAuthClientsProps = {
- appKey: string;
-};
-
-function AdminApplicationAuthClients(
- props: AdminApplicationAuthClientsProps
-): React.ReactElement {
+function AdminApplicationAuthClients(props) {
const { appKey } = props;
const formatMessage = useFormatMessage();
const { appAuthClients, loading } = useAppAuthClients({ appKey });
-
if (loading)
return ;
-
if (!appAuthClients?.length) {
return (
);
}
-
const sortedAuthClients = appAuthClients.slice().sort((a, b) => {
if (a.id < b.id) {
return -1;
@@ -46,7 +34,6 @@ function AdminApplicationAuthClients(
}
return 0;
});
-
return (
{sortedAuthClients.map((client) => (
@@ -67,7 +54,7 @@ function AdminApplicationAuthClients(
label={formatMessage(
client?.active
? 'adminAppsAuthClients.statusActive'
- : 'adminAppsAuthClients.statusInactive'
+ : 'adminAppsAuthClients.statusInactive',
)}
/>
@@ -85,5 +72,4 @@ function AdminApplicationAuthClients(
);
}
-
export default AdminApplicationAuthClients;
diff --git a/packages/web/src/components/AdminApplicationCreateAuthClient/index.tsx b/packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx
similarity index 83%
rename from packages/web/src/components/AdminApplicationCreateAuthClient/index.tsx
rename to packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx
index 4c297423..c253382e 100644
--- a/packages/web/src/components/AdminApplicationCreateAuthClient/index.tsx
+++ b/packages/web/src/components/AdminApplicationCreateAuthClient/index.jsx
@@ -1,24 +1,11 @@
import React, { useCallback, useMemo } from 'react';
-import type { IApp } from 'types';
-import { FieldValues, SubmitHandler } from 'react-hook-form';
import { useMutation } from '@apollo/client';
import { CREATE_APP_CONFIG } from 'graphql/mutations/create-app-config';
import { CREATE_APP_AUTH_CLIENT } from 'graphql/mutations/create-app-auth-client';
-
import useAppConfig from 'hooks/useAppConfig.ee';
import useFormatMessage from 'hooks/useFormatMessage';
-
import AdminApplicationAuthClientDialog from 'components/AdminApplicationAuthClientDialog';
-
-type AdminApplicationCreateAuthClientProps = {
- appKey: string;
- application: IApp;
- onClose: () => void;
-};
-
-export default function AdminApplicationCreateAuthClient(
- props: AdminApplicationCreateAuthClientProps
-): React.ReactElement {
+export default function AdminApplicationCreateAuthClient(props) {
const { appKey, application, onClose } = props;
const { auth } = application;
const formatMessage = useFormatMessage();
@@ -37,10 +24,8 @@ export default function AdminApplicationCreateAuthClient(
refetchQueries: ['GetAppAuthClients'],
context: { autoSnackbar: false },
});
-
- const submitHandler: SubmitHandler = async (values) => {
+ const submitHandler = async (values) => {
let appConfigId = appConfig?.id;
-
if (!appConfigId) {
const { data: appConfigData } = await createAppConfig({
variables: {
@@ -54,9 +39,7 @@ export default function AdminApplicationCreateAuthClient(
});
appConfigId = appConfigData.createAppConfig.id;
}
-
const { name, active, ...formattedAuthDefaults } = values;
-
await createAppAuthClient({
variables: {
input: {
@@ -67,17 +50,13 @@ export default function AdminApplicationCreateAuthClient(
},
},
});
-
onClose();
};
-
const getAuthFieldsDefaultValues = useCallback(() => {
if (!auth?.fields) {
return {};
}
- const defaultValues: {
- [key: string]: any;
- } = {};
+ const defaultValues = {};
auth.fields.forEach((field) => {
if (field.value || field.type !== 'string') {
defaultValues[field.key] = field.value;
@@ -87,16 +66,14 @@ export default function AdminApplicationCreateAuthClient(
});
return defaultValues;
}, [auth?.fields]);
-
const defaultValues = useMemo(
() => ({
name: '',
active: false,
...getAuthFieldsDefaultValues(),
}),
- [getAuthFieldsDefaultValues]
+ [getAuthFieldsDefaultValues],
);
-
return (
{
+ const handleSubmit = async (values) => {
try {
if (!appConfig) {
await createAppConfig({
@@ -56,23 +45,21 @@ function AdminApplicationSettings(
enqueueSnackbar(formatMessage('adminAppsSettings.successfullySaved'), {
variant: 'success',
SnackbarProps: {
- 'data-test': 'snackbar-save-admin-apps-settings-success'
- }
+ 'data-test': 'snackbar-save-admin-apps-settings-success',
+ },
});
} catch (error) {
throw new Error('Failed while saving!');
}
};
-
const defaultValues = useMemo(
() => ({
allowCustomConnection: appConfig?.allowCustomConnection || false,
shared: appConfig?.shared || false,
disabled: appConfig?.disabled || false,
}),
- [appConfig]
+ [appConfig],
);
-
return (
);
}
-
export default AdminApplicationSettings;
diff --git a/packages/web/src/components/AdminApplicationSettings/style.ts b/packages/web/src/components/AdminApplicationSettings/style.js
similarity index 99%
rename from packages/web/src/components/AdminApplicationSettings/style.ts
rename to packages/web/src/components/AdminApplicationSettings/style.js
index a32940c1..7f42ed86 100644
--- a/packages/web/src/components/AdminApplicationSettings/style.ts
+++ b/packages/web/src/components/AdminApplicationSettings/style.js
@@ -1,6 +1,5 @@
import { styled } from '@mui/material/styles';
import SwitchBase from 'components/Switch';
-
export const Switch = styled(SwitchBase)`
justify-content: space-between;
margin: 0;
diff --git a/packages/web/src/components/AdminApplicationUpdateAuthClient/index.tsx b/packages/web/src/components/AdminApplicationUpdateAuthClient/index.jsx
similarity index 81%
rename from packages/web/src/components/AdminApplicationUpdateAuthClient/index.tsx
rename to packages/web/src/components/AdminApplicationUpdateAuthClient/index.jsx
index 8182f8de..f35f52c5 100644
--- a/packages/web/src/components/AdminApplicationUpdateAuthClient/index.tsx
+++ b/packages/web/src/components/AdminApplicationUpdateAuthClient/index.jsx
@@ -1,31 +1,18 @@
import React, { useCallback, useMemo } from 'react';
import { useParams } from 'react-router-dom';
-import type { IApp } from 'types';
-import { FieldValues, SubmitHandler } from 'react-hook-form';
import { useMutation } from '@apollo/client';
import { UPDATE_APP_AUTH_CLIENT } from 'graphql/mutations/update-app-auth-client';
-
import useAppAuthClient from 'hooks/useAppAuthClient.ee';
import useFormatMessage from 'hooks/useFormatMessage';
import AdminApplicationAuthClientDialog from 'components/AdminApplicationAuthClientDialog';
-
-type AdminApplicationUpdateAuthClientProps = {
- application: IApp;
- onClose: () => void;
-};
-
-export default function AdminApplicationUpdateAuthClient(
- props: AdminApplicationUpdateAuthClientProps
-): React.ReactElement {
+export default function AdminApplicationUpdateAuthClient(props) {
const { application, onClose } = props;
const { auth } = application;
const authFields = auth?.fields?.map((field) => ({
...field,
required: false,
}));
-
const formatMessage = useFormatMessage();
-
const { clientId } = useParams();
const { appAuthClient, loading: loadingAuthClient } =
useAppAuthClient(clientId);
@@ -34,8 +21,7 @@ export default function AdminApplicationUpdateAuthClient(
refetchQueries: ['GetAppAuthClients'],
context: { autoSnackbar: false },
});
-
- const submitHandler: SubmitHandler = async (values) => {
+ const submitHandler = async (values) => {
if (!appAuthClient) {
return;
}
@@ -52,14 +38,11 @@ export default function AdminApplicationUpdateAuthClient(
});
onClose();
};
-
const getAuthFieldsDefaultValues = useCallback(() => {
if (!authFields) {
return {};
}
- const defaultValues: {
- [key: string]: any;
- } = {};
+ const defaultValues = {};
authFields.forEach((field) => {
if (field.value || field.type !== 'string') {
defaultValues[field.key] = field.value;
@@ -69,16 +52,14 @@ export default function AdminApplicationUpdateAuthClient(
});
return defaultValues;
}, [auth?.fields]);
-
const defaultValues = useMemo(
() => ({
name: appAuthClient?.name || '',
active: appAuthClient?.active || false,
...getAuthFieldsDefaultValues(),
}),
- [appAuthClient, getAuthFieldsDefaultValues]
+ [appAuthClient, getAuthFieldsDefaultValues],
);
-
return (
setDrawerOpen(true);
const closeDrawer = () => setDrawerOpen(false);
const drawerLinks = createDrawerLinks({
@@ -108,7 +83,7 @@ export default function SettingsLayout({
currentUserAbility.can('create', 'SamlAuthProvider'),
canUpdateApp: currentUserAbility.can('update', 'App'),
});
-
+ const a = 123;
const drawerBottomLinks = [
{
Icon: ArrowBackIosNewIcon,
@@ -117,7 +92,6 @@ export default function SettingsLayout({
dataTest: 'go-back-drawer-link',
},
];
-
return (
<>
{
+const ApolloProvider = (props) => {
const enqueueSnackbar = useEnqueueSnackbar();
const authentication = useAuthentication();
-
const onError = React.useCallback(
(message) => {
enqueueSnackbar(message, {
variant: 'error',
SnackbarProps: {
- 'data-test': 'snackbar-error'
- }
+ 'data-test': 'snackbar-error',
+ },
});
},
- [enqueueSnackbar]
+ [enqueueSnackbar],
);
-
const client = React.useMemo(() => {
return mutateAndGetClient({
onError,
token: authentication.token,
});
}, [onError, authentication]);
-
return ;
};
-
export default ApolloProvider;
diff --git a/packages/web/src/components/AppAuthClientsDialog/index.ee.tsx b/packages/web/src/components/AppAuthClientsDialog/index.ee.jsx
similarity index 85%
rename from packages/web/src/components/AppAuthClientsDialog/index.ee.tsx
rename to packages/web/src/components/AppAuthClientsDialog/index.ee.jsx
index ff044f79..395bdc24 100644
--- a/packages/web/src/components/AppAuthClientsDialog/index.ee.tsx
+++ b/packages/web/src/components/AppAuthClientsDialog/index.ee.jsx
@@ -5,33 +5,22 @@ import ListItem from '@mui/material/ListItem';
import ListItemButton from '@mui/material/ListItemButton';
import ListItemText from '@mui/material/ListItemText';
import * as React from 'react';
-
import useAppAuthClients from 'hooks/useAppAuthClients.ee';
import useFormatMessage from 'hooks/useFormatMessage';
-
-type AppAuthClientsDialogProps = {
- appKey: string;
- onClientClick: (appAuthClientId: string) => void;
- onClose: () => void;
-};
-
-export default function AppAuthClientsDialog(props: AppAuthClientsDialogProps) {
+export default function AppAuthClientsDialog(props) {
const { appKey, onClientClick, onClose } = props;
const { appAuthClients } = useAppAuthClients({ appKey, active: true });
const formatMessage = useFormatMessage();
-
React.useEffect(
function autoAuthenticateSingleClient() {
if (appAuthClients?.length === 1) {
onClientClick(appAuthClients[0].id);
}
},
- [appAuthClients]
+ [appAuthClients],
);
-
if (!appAuthClients?.length || appAuthClients?.length === 1)
return ;
-
return (