feat: fetch database connection tables in Settings/Integrations/Datab… (#4882)
…ase/Connection Closes #4758 --------- Co-authored-by: Thomas Trompette <thomast@twenty.com>
This commit is contained in:
@ -5,6 +5,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { IconSettings } from 'twenty-ui';
|
||||
|
||||
import { useDeleteOneDatabaseConnection } from '@/databases/hooks/useDeleteOneDatabaseConnection';
|
||||
import { useGetDatabaseConnection } from '@/databases/hooks/useGetDatabaseConnection';
|
||||
import { useGetDatabaseConnectionTables } from '@/databases/hooks/useGetDatabaseConnectionTables';
|
||||
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
|
||||
import {
|
||||
SettingsIntegrationDatabaseTablesListCard,
|
||||
@ -12,6 +14,7 @@ import {
|
||||
settingsIntegrationsDatabaseTablesSchema,
|
||||
} from '@/settings/integrations/components/SettingsIntegrationDatabaseTablesListCard';
|
||||
import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
|
||||
import { getConnectionDbName } from '@/settings/integrations/utils/getConnectionDbName';
|
||||
import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
|
||||
import { AppPath } from '@/types/AppPath';
|
||||
import { SettingsPath } from '@/types/SettingsPath';
|
||||
@ -21,10 +24,9 @@ import { Section } from '@/ui/layout/section/components/Section';
|
||||
import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
|
||||
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
|
||||
import { SettingsIntegrationDatabaseConnectionSummaryCard } from '~/pages/settings/integrations/SettingsIntegrationDatabaseConnectionSummaryCard';
|
||||
import { mockedRemoteObjectIntegrations } from '~/testing/mock-data/remoteObjectDatabases';
|
||||
|
||||
export const SettingsIntegrationDatabaseConnection = () => {
|
||||
const { databaseKey = '', connectionKey = '' } = useParams();
|
||||
const { databaseKey = '', connectionId = '' } = useParams();
|
||||
const navigate = useNavigate();
|
||||
|
||||
const [integrationCategoryAll] = useSettingsIntegrationCategories();
|
||||
@ -43,11 +45,11 @@ export const SettingsIntegrationDatabaseConnection = () => {
|
||||
((databaseKey === 'airtable' && isAirtableIntegrationEnabled) ||
|
||||
(databaseKey === 'postgresql' && isPostgresqlIntegrationEnabled));
|
||||
|
||||
const connections =
|
||||
mockedRemoteObjectIntegrations.find(
|
||||
({ key }) => key === integration?.from.key,
|
||||
)?.connections || [];
|
||||
const connection = connections.find(({ key }) => key === connectionKey);
|
||||
const { connection, loading } = useGetDatabaseConnection({
|
||||
databaseKey,
|
||||
connectionId,
|
||||
skip: !isIntegrationAvailable,
|
||||
});
|
||||
|
||||
const { deleteOneDatabaseConnection } = useDeleteOneDatabaseConnection();
|
||||
|
||||
@ -60,10 +62,22 @@ export const SettingsIntegrationDatabaseConnection = () => {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (!isIntegrationAvailable || !connection) {
|
||||
if (!isIntegrationAvailable || (!loading && !connection)) {
|
||||
navigate(AppPath.NotFound);
|
||||
}
|
||||
}, [integration, databaseKey, navigate, isIntegrationAvailable, connection]);
|
||||
}, [
|
||||
integration,
|
||||
databaseKey,
|
||||
navigate,
|
||||
isIntegrationAvailable,
|
||||
connection,
|
||||
loading,
|
||||
]);
|
||||
|
||||
const { tables } = useGetDatabaseConnectionTables({
|
||||
connectionId,
|
||||
skip: !isIntegrationAvailable || !connection,
|
||||
});
|
||||
|
||||
const formConfig = useForm<SettingsIntegrationsDatabaseTablesFormValues>({
|
||||
mode: 'onTouched',
|
||||
@ -76,7 +90,7 @@ export const SettingsIntegrationDatabaseConnection = () => {
|
||||
SettingsPath.Integrations,
|
||||
);
|
||||
|
||||
const tables = mockedRemoteObjectIntegrations[0].connections[0].tables;
|
||||
const connectionName = getConnectionDbName({ integration, connection });
|
||||
|
||||
return (
|
||||
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||
@ -93,15 +107,15 @@ export const SettingsIntegrationDatabaseConnection = () => {
|
||||
children: integration.text,
|
||||
href: `${settingsIntegrationsPagePath}/${databaseKey}`,
|
||||
},
|
||||
{ children: connection.name },
|
||||
{ children: connectionName },
|
||||
]}
|
||||
/>
|
||||
<Section>
|
||||
<H2Title title="About" description="About this remote object" />
|
||||
<SettingsIntegrationDatabaseConnectionSummaryCard
|
||||
databaseLogoUrl={integration.from.image}
|
||||
connectionName={connection.name}
|
||||
connectedTablesNb={tables.length}
|
||||
connectionId={connectionId}
|
||||
connectionName={connectionName}
|
||||
onRemove={deleteConnection}
|
||||
/>
|
||||
</Section>
|
||||
|
||||
@ -2,7 +2,7 @@ import styled from '@emotion/styled';
|
||||
import { IconDotsVertical, IconTrash } from 'twenty-ui';
|
||||
|
||||
import { SettingsSummaryCard } from '@/settings/components/SettingsSummaryCard';
|
||||
import { SettingsIntegrationDatabaseConnectedTablesStatus } from '@/settings/integrations/components/SettingsIntegrationDatabaseConnectedTablesStatus';
|
||||
import { SettingsIntegrationDatabaseConnectionSyncStatus } from '@/settings/integrations/components/SettingsIntegrationDatabaseConnectionSyncStatus';
|
||||
import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
|
||||
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
|
||||
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
|
||||
@ -11,8 +11,8 @@ import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
|
||||
|
||||
type SettingsIntegrationDatabaseConnectionSummaryCardProps = {
|
||||
databaseLogoUrl: string;
|
||||
connectionId: string;
|
||||
connectionName: string;
|
||||
connectedTablesNb: number;
|
||||
onRemove: () => void;
|
||||
};
|
||||
|
||||
@ -30,8 +30,8 @@ const StyledDatabaseLogo = styled.img`
|
||||
|
||||
export const SettingsIntegrationDatabaseConnectionSummaryCard = ({
|
||||
databaseLogoUrl,
|
||||
connectionId,
|
||||
connectionName,
|
||||
connectedTablesNb,
|
||||
onRemove,
|
||||
}: SettingsIntegrationDatabaseConnectionSummaryCardProps) => {
|
||||
const dropdownId =
|
||||
@ -49,8 +49,8 @@ export const SettingsIntegrationDatabaseConnectionSummaryCard = ({
|
||||
}
|
||||
rightComponent={
|
||||
<>
|
||||
<SettingsIntegrationDatabaseConnectedTablesStatus
|
||||
connectedTablesCount={connectedTablesNb}
|
||||
<SettingsIntegrationDatabaseConnectionSyncStatus
|
||||
connectionId={connectionId}
|
||||
/>
|
||||
<Dropdown
|
||||
dropdownId={dropdownId}
|
||||
|
||||
@ -41,7 +41,7 @@ const createRemoteServerInputSchema = newConnectionSchema
|
||||
},
|
||||
userMappingOptions: {
|
||||
password: values.password,
|
||||
user: values.username,
|
||||
username: values.username,
|
||||
},
|
||||
}));
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ const meta: Meta<PageDecoratorArgs> = {
|
||||
routePath: getSettingsPagePath(SettingsPath.IntegrationDatabaseConnection),
|
||||
routeParams: {
|
||||
':databaseKey': 'postgresql',
|
||||
':connectionKey': 'twenty_postgres',
|
||||
':connectionId': '67cbfd35-8dd4-4591-b9d4-c1906281a5da',
|
||||
},
|
||||
},
|
||||
parameters: {
|
||||
|
||||
Reference in New Issue
Block a user