feat: add Settings/Integrations/Database/New Connection form (#4787)
Closes #4554 <img width="556" alt="image" src="https://github.com/twentyhq/twenty/assets/3098428/56738254-aa43-4bfd-b7c5-29a9e1b7258f"> --------- Co-authored-by: Thomas Trompette <thomast@twenty.com>
This commit is contained in:
@ -0,0 +1,62 @@
|
|||||||
|
import { Controller, useFormContext } from 'react-hook-form';
|
||||||
|
import styled from '@emotion/styled';
|
||||||
|
import { z } from 'zod';
|
||||||
|
|
||||||
|
import { TextInput } from '@/ui/input/components/TextInput';
|
||||||
|
|
||||||
|
export const settingsIntegrationPostgreSQLConnectionFormSchema = z.object({
|
||||||
|
dbname: z.string().min(1),
|
||||||
|
host: z.string().min(1),
|
||||||
|
port: z.number().positive(),
|
||||||
|
username: z.string().min(1),
|
||||||
|
password: z.string().min(1),
|
||||||
|
});
|
||||||
|
|
||||||
|
type SettingsIntegrationPostgreSQLConnectionFormValues = z.infer<
|
||||||
|
typeof settingsIntegrationPostgreSQLConnectionFormSchema
|
||||||
|
>;
|
||||||
|
|
||||||
|
const StyledInputsContainer = styled.div`
|
||||||
|
display: grid;
|
||||||
|
gap: ${({ theme }) => theme.spacing(2, 4)};
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
grid-template-areas:
|
||||||
|
'input-1 input-1'
|
||||||
|
'input-2 input-3'
|
||||||
|
'input-4 input-5';
|
||||||
|
|
||||||
|
& :first-child {
|
||||||
|
grid-area: input-1;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
export const SettingsIntegrationPostgreSQLConnectionForm = () => {
|
||||||
|
const { control } =
|
||||||
|
useFormContext<SettingsIntegrationPostgreSQLConnectionFormValues>();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<StyledInputsContainer>
|
||||||
|
{[
|
||||||
|
{ name: 'dbname' as const, label: 'Database Name' },
|
||||||
|
{ name: 'host' as const, label: 'Host' },
|
||||||
|
{ name: 'port' as const, label: 'Port' },
|
||||||
|
{ name: 'username' as const, label: 'Username' },
|
||||||
|
{ name: 'password' as const, label: 'Password' },
|
||||||
|
].map(({ name, label }) => (
|
||||||
|
<Controller
|
||||||
|
key={name}
|
||||||
|
name={name}
|
||||||
|
control={control}
|
||||||
|
render={({ field: { onChange, value } }) => (
|
||||||
|
<TextInput
|
||||||
|
label={label}
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
fullWidth
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</StyledInputsContainer>
|
||||||
|
);
|
||||||
|
};
|
||||||
@ -46,6 +46,10 @@ export const SettingsIntegrationDatabaseConnection = () => {
|
|||||||
|
|
||||||
if (!isIntegrationAvailable || !connection) return null;
|
if (!isIntegrationAvailable || !connection) return null;
|
||||||
|
|
||||||
|
const settingsIntegrationsPagePath = getSettingsPagePath(
|
||||||
|
SettingsPath.Integrations,
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
||||||
<SettingsPageContainer>
|
<SettingsPageContainer>
|
||||||
@ -53,11 +57,11 @@ export const SettingsIntegrationDatabaseConnection = () => {
|
|||||||
links={[
|
links={[
|
||||||
{
|
{
|
||||||
children: 'Integrations',
|
children: 'Integrations',
|
||||||
href: getSettingsPagePath(SettingsPath.Integrations),
|
href: settingsIntegrationsPagePath,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
children: integration.text,
|
children: integration.text,
|
||||||
href: `/settings/integrations/${databaseKey}`,
|
href: `${settingsIntegrationsPagePath}/${databaseKey}`,
|
||||||
},
|
},
|
||||||
{ children: connection.name },
|
{ children: connection.name },
|
||||||
]}
|
]}
|
||||||
|
|||||||
@ -1,14 +1,31 @@
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
|
import { FormProvider, useForm } from 'react-hook-form';
|
||||||
import { useNavigate, useParams } from 'react-router-dom';
|
import { useNavigate, useParams } from 'react-router-dom';
|
||||||
|
import { zodResolver } from '@hookform/resolvers/zod';
|
||||||
import { IconSettings } from 'twenty-ui';
|
import { IconSettings } from 'twenty-ui';
|
||||||
|
import { z } from 'zod';
|
||||||
|
|
||||||
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
||||||
|
import {
|
||||||
|
SettingsIntegrationPostgreSQLConnectionForm,
|
||||||
|
settingsIntegrationPostgreSQLConnectionFormSchema,
|
||||||
|
} from '@/settings/integrations/components/SettingsIntegrationDatabaseConnectionForm';
|
||||||
import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
|
import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
|
||||||
|
import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
|
||||||
import { AppPath } from '@/types/AppPath';
|
import { AppPath } from '@/types/AppPath';
|
||||||
|
import { SettingsPath } from '@/types/SettingsPath';
|
||||||
|
import { H2Title } from '@/ui/display/typography/components/H2Title';
|
||||||
import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
|
import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
|
||||||
|
import { Section } from '@/ui/layout/section/components/Section';
|
||||||
import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
|
import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
|
||||||
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
|
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
|
||||||
|
|
||||||
|
const newConnectionSchema = settingsIntegrationPostgreSQLConnectionFormSchema;
|
||||||
|
|
||||||
|
type SettingsIntegrationNewConnectionFormValues = z.infer<
|
||||||
|
typeof newConnectionSchema
|
||||||
|
>;
|
||||||
|
|
||||||
export const SettingsIntegrationNewDatabaseConnection = () => {
|
export const SettingsIntegrationNewDatabaseConnection = () => {
|
||||||
const { databaseKey = '' } = useParams();
|
const { databaseKey = '' } = useParams();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@ -35,22 +52,46 @@ export const SettingsIntegrationNewDatabaseConnection = () => {
|
|||||||
}
|
}
|
||||||
}, [integration, databaseKey, navigate, isIntegrationAvailable]);
|
}, [integration, databaseKey, navigate, isIntegrationAvailable]);
|
||||||
|
|
||||||
|
const formConfig = useForm<SettingsIntegrationNewConnectionFormValues>({
|
||||||
|
mode: 'onTouched',
|
||||||
|
resolver: zodResolver(newConnectionSchema),
|
||||||
|
});
|
||||||
|
|
||||||
if (!isIntegrationAvailable) return null;
|
if (!isIntegrationAvailable) return null;
|
||||||
|
|
||||||
|
const settingsIntegrationsPagePath = getSettingsPagePath(
|
||||||
|
SettingsPath.Integrations,
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||||
<SettingsPageContainer>
|
<FormProvider {...formConfig}>
|
||||||
<Breadcrumb
|
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
|
||||||
links={[
|
<SettingsPageContainer>
|
||||||
{ children: 'Integrations', href: '/settings/integrations' },
|
<Breadcrumb
|
||||||
{
|
links={[
|
||||||
children: integration.text,
|
{
|
||||||
href: `/settings/integrations/${databaseKey}`,
|
children: 'Integrations',
|
||||||
},
|
href: settingsIntegrationsPagePath,
|
||||||
{ children: 'New' },
|
},
|
||||||
]}
|
{
|
||||||
/>
|
children: integration.text,
|
||||||
</SettingsPageContainer>
|
href: `${settingsIntegrationsPagePath}/${databaseKey}`,
|
||||||
</SubMenuTopBarContainer>
|
},
|
||||||
|
{ children: 'New' },
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
{databaseKey === 'postgresql' ? (
|
||||||
|
<Section>
|
||||||
|
<H2Title
|
||||||
|
title="Connect a new database"
|
||||||
|
description="Provide the information to connect your PostgreSQL database"
|
||||||
|
/>
|
||||||
|
<SettingsIntegrationPostgreSQLConnectionForm />
|
||||||
|
</Section>
|
||||||
|
) : null}
|
||||||
|
</SettingsPageContainer>
|
||||||
|
</SubMenuTopBarContainer>
|
||||||
|
</FormProvider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user