diff --git a/ui/app/api/peers/route.ts b/ui/app/api/peers/route.ts index 964157c71b..200aab3d79 100644 --- a/ui/app/api/peers/route.ts +++ b/ui/app/api/peers/route.ts @@ -56,7 +56,7 @@ const constructPeer = ( name, type: DBType.CLICKHOUSE, clickhouseConfig: config as ClickhouseConfig, - }; + }; case 'S3': return { name, diff --git a/ui/app/peers/create/[peerType]/handlers.ts b/ui/app/peers/create/[peerType]/handlers.ts index ab8718dc14..e43164aa96 100644 --- a/ui/app/peers/create/[peerType]/handlers.ts +++ b/ui/app/peers/create/[peerType]/handlers.ts @@ -7,6 +7,7 @@ import { S3Config } from '@/grpc_generated/peers'; import { Dispatch, SetStateAction } from 'react'; import { bqSchema, + chSchema, peerNameSchema, pgSchema, s3Schema, @@ -51,7 +52,7 @@ const validateFields = ( case 'CLICKHOUSE': const chConfig = chSchema.safeParse(config); if (!chConfig.success) validationErr = chConfig.error.issues[0].message; - break; + break; case 'S3': const s3Config = s3Schema.safeParse(config); if (!s3Config.success) validationErr = s3Config.error.issues[0].message; diff --git a/ui/app/peers/create/[peerType]/helpers/ch.ts b/ui/app/peers/create/[peerType]/helpers/ch.ts index a85552c2b8..57eee3c39a 100644 --- a/ui/app/peers/create/[peerType]/helpers/ch.ts +++ b/ui/app/peers/create/[peerType]/helpers/ch.ts @@ -1,5 +1,4 @@ -import { ClickhouseConfig, SSHConfig } from '@/grpc_generated/peers'; -import { Dispatch, SetStateAction } from 'react'; +import { ClickhouseConfig } from '@/grpc_generated/peers'; import { PeerSetting } from './common'; export const clickhouseSetting: PeerSetting[] = [ @@ -49,7 +48,6 @@ export const clickhouseSetting: PeerSetting[] = [ helpfulLink: 'https://docs.snowflake.com/en/user-guide/data-load-s3-config-storage-integration', }, - ]; export const blankClickhouseSetting: ClickhouseConfig = { @@ -58,5 +56,5 @@ export const blankClickhouseSetting: ClickhouseConfig = { user: '', password: '', database: '', - s3Integration:'' -}; \ No newline at end of file + s3Integration: '', +}; diff --git a/ui/app/peers/create/[peerType]/helpers/common.ts b/ui/app/peers/create/[peerType]/helpers/common.ts index 3b7a017283..a80e7bbbd6 100644 --- a/ui/app/peers/create/[peerType]/helpers/common.ts +++ b/ui/app/peers/create/[peerType]/helpers/common.ts @@ -1,9 +1,9 @@ import { PeerConfig, PeerSetter } from '@/app/dto/PeersDTO'; import { blankBigquerySetting } from './bq'; +import { blankClickhouseSetting } from './ch'; import { blankPostgresSetting } from './pg'; import { blankS3Setting } from './s3'; import { blankSnowflakeSetting } from './sf'; -import {blankClickhouseSetting} from './ch'; export interface PeerSetting { label: string; diff --git a/ui/app/peers/create/[peerType]/page.tsx b/ui/app/peers/create/[peerType]/page.tsx index 4ea5f30262..83097574a6 100644 --- a/ui/app/peers/create/[peerType]/page.tsx +++ b/ui/app/peers/create/[peerType]/page.tsx @@ -1,10 +1,10 @@ 'use client'; import { PeerConfig } from '@/app/dto/PeersDTO'; import BigqueryForm from '@/components/PeerForms/BigqueryConfig'; +import ClickhouseForm from '@/components/PeerForms/ClickhouseConfig'; import PostgresForm from '@/components/PeerForms/PostgresForm'; import S3Form from '@/components/PeerForms/S3Form'; import SnowflakeForm from '@/components/PeerForms/SnowflakeForm'; -import ClickhouseForm from '@/components/PeerForms/ClickhouseConfig'; import { Button } from '@/lib/Button'; import { ButtonGroup } from '@/lib/ButtonGroup'; @@ -17,10 +17,10 @@ import Link from 'next/link'; import { useRouter } from 'next/navigation'; import { useState } from 'react'; import { handleCreate, handleValidate } from './handlers'; +import { clickhouseSetting } from './helpers/ch'; import { getBlankSetting } from './helpers/common'; import { postgresSetting } from './helpers/pg'; import { snowflakeSetting } from './helpers/sf'; -import {clickhouseSetting} from './helpers/ch'; type CreateConfigProps = { params: { peerType: string }; @@ -48,7 +48,9 @@ export default function CreateConfig({ case 'BIGQUERY': return ; case 'CLICKHOUSE': - return ; + return ( + + ); case 'S3': return ; default: diff --git a/ui/app/peers/create/[peerType]/schema.ts b/ui/app/peers/create/[peerType]/schema.ts index 5b4e7f81af..6a21892f39 100644 --- a/ui/app/peers/create/[peerType]/schema.ts +++ b/ui/app/peers/create/[peerType]/schema.ts @@ -272,7 +272,6 @@ export const chSchema = z.object({ .max(100, 'Password must be less than 100 characters'), }); - export const s3Schema = z.object({ url: z .string({ diff --git a/ui/components/PeerComponent.tsx b/ui/components/PeerComponent.tsx index 6cf36bde11..318aff7529 100644 --- a/ui/components/PeerComponent.tsx +++ b/ui/components/PeerComponent.tsx @@ -19,7 +19,7 @@ export const DBTypeToImageMapping = (peerType: DBType | string) => { case 'S3': return '/svgs/aws.svg'; case 'CLICKHOUSE': - return '/svgs/ch.svg'; + return '/svgs/ch.svg'; case DBType.EVENTHUB_GROUP: case DBType.EVENTHUB: return '/svgs/ms.svg'; diff --git a/ui/components/PeerForms/ClickhouseConfig.tsx b/ui/components/PeerForms/ClickhouseConfig.tsx index 51ab891cd8..1819e626df 100644 --- a/ui/components/PeerForms/ClickhouseConfig.tsx +++ b/ui/components/PeerForms/ClickhouseConfig.tsx @@ -153,4 +153,4 @@ export default function PostgresForm({ settings, setter }: ConfigProps) { ))} ); -} \ No newline at end of file +} diff --git a/ui/components/SelectSource.tsx b/ui/components/SelectSource.tsx index a3f848bb3a..04cc5bf3a3 100644 --- a/ui/components/SelectSource.tsx +++ b/ui/components/SelectSource.tsx @@ -32,8 +32,7 @@ export default function SelectSource({ value === 'SNOWFLAKE' || value === 'BIGQUERY' || value === 'S3' || - value === 'CLICKHOUSE' - ) + value === 'CLICKHOUSE') ) .map((value) => ({ label: value, value }));