[DOP-22196] fix after review

Author: Zabilsya

src/entities/connection/constants.ts

@@ -3,10 +3,30 @@ import { prepareOptionsForSelect } from '@shared/ui';
 
 import { ConnectionBucketStyle, ConnectionProtocol } from './api';
 
-export const CONNECTION_TYPE_SELECT_OPTIONS = prepareOptionsForSelect<ConnectionType>({
-  data: Object.values(ConnectionType),
-  renderLabel: (data) => data,
-  renderValue: (data) => data,
+export const CONNECTION_TYPE_NAMES: Record<ConnectionType, string> = {
+  [ConnectionType.CLICKHOUSE]: 'ClickHouse',
+  [ConnectionType.HDFS]: 'HDFS',
+  [ConnectionType.HIVE]: 'Hive',
+  [ConnectionType.MS_SQL]: 'MSSQL',
+  [ConnectionType.MY_SQL]: 'MySQL',
+  [ConnectionType.ORACLE]: 'Oracle',
+  [ConnectionType.POSTGRES]: 'Postgres',
+  [ConnectionType.S3]: 'S3',
+};
+
+export const CONNECTION_TYPE_SELECT_OPTIONS = prepareOptionsForSelect({
+  data: [
+    { value: ConnectionType.CLICKHOUSE, label: CONNECTION_TYPE_NAMES[ConnectionType.CLICKHOUSE] },
+    { value: ConnectionType.HDFS, label: CONNECTION_TYPE_NAMES[ConnectionType.HDFS] },
+    { value: ConnectionType.HIVE, label: CONNECTION_TYPE_NAMES[ConnectionType.HIVE] },
+    { value: ConnectionType.MS_SQL, label: CONNECTION_TYPE_NAMES[ConnectionType.MS_SQL] },
+    { value: ConnectionType.MY_SQL, label: CONNECTION_TYPE_NAMES[ConnectionType.MY_SQL] },
+    { value: ConnectionType.ORACLE, label: CONNECTION_TYPE_NAMES[ConnectionType.ORACLE] },
+    { value: ConnectionType.POSTGRES, label: CONNECTION_TYPE_NAMES[ConnectionType.POSTGRES] },
+    { value: ConnectionType.S3, label: CONNECTION_TYPE_NAMES[ConnectionType.S3] },
+  ],
+  renderLabel: (data) => data.label,
+  renderValue: (data) => data.value,
 });
 
 export const CONNECTION_BUCKET_STYLE_SELECT_OPTIONS = prepareOptionsForSelect<ConnectionBucketStyle>({

src/entities/transfer/api/types.ts

@@ -12,12 +12,18 @@ export interface Transfer {
     | TransferParamsHive
     | TransferParamsOracle
     | TransferParamsPostgres
+    | TransferParamsClickhouse
+    | TransferParamsMsSql
+    | TransferParamsMySql
     | TransferSourceParamsHdfs
     | TransferSourceParamsS3;
   target_params:
     | TransferParamsHive
     | TransferParamsOracle
     | TransferParamsPostgres
+    | TransferParamsClickhouse
+    | TransferParamsMsSql
+    | TransferParamsMySql
     | TransferTargetParamsHdfs
     | TransferTargetParamsS3;
   strategy_params: TransferStrategyParams;
@@ -46,6 +52,21 @@ interface TransferParamsPostgres {
   table_name: string;
 }
 
+interface TransferParamsMySql {
+  type: ConnectionType.MY_SQL;
+  table_name: string;
+}
+
+interface TransferParamsMsSql {
+  type: ConnectionType.MS_SQL;
+  table_name: string;
+}
+
+interface TransferParamsClickhouse {
+  type: ConnectionType.CLICKHOUSE;
+  table_name: string;
+}
+
 interface TransferParamsHdfs {
   type: ConnectionType.HDFS;
   directory_path: string;

src/features/connection/ConnectionDetailInfo/index.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Descriptions } from 'antd';
 import { Link } from 'react-router-dom';
+import { CONNECTION_TYPE_NAMES } from '@entities/connection';
 
 import { ConnectionDetailInfoProps } from './types';
 import { getConnectionAuthData, getConnectionData } from './utils';
@@ -21,7 +22,7 @@ export const ConnectionDetailInfo = ({ connection, group, ...props }: Connection
         <Link to={`/groups/${group.id}`}>{group.name}</Link>
       </Descriptions.Item>
       <Descriptions.Item label="Type" span={3}>
-        {connection.connection_data.type}
+        {CONNECTION_TYPE_NAMES[connection.connection_data.type]}
       </Descriptions.Item>
       {getConnectionAuthData({ data: connection.auth_data }).map((item, index) => (
         <Descriptions.Item label={item.label} span={3} key={index}>

src/features/connection/ConnectionList/constants.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { PaginationResponse } from '@shared/types';
 import { TableColumns } from '@shared/ui';
 import { Link } from 'react-router-dom';
-import { Connection } from '@entities/connection';
+import { Connection, CONNECTION_TYPE_NAMES } from '@entities/connection';
 
 export const CONNECTION_LIST_COLUMNS: TableColumns<PaginationResponse<Connection>> = [
   {
@@ -19,7 +19,7 @@ export const CONNECTION_LIST_COLUMNS: TableColumns<PaginationResponse<Connection
   {
     title: 'Type',
     dataIndex: 'connection_data',
-    render: (data, record) => record.connection_data.type,
+    render: (data, record) => CONNECTION_TYPE_NAMES[record.connection_data.type],
     width: 100,
   },
   {

src/features/connection/UpdateConnection/utils/getUpdateConnectionInitialValues/index.ts

@@ -47,6 +47,33 @@ export const getUpdateConnectionInitialValues = (connection: Connection): Update
       ...connection.auth_data,
     });
   }
+  if (
+    connection.auth_data.type === ConnectionType.MS_SQL &&
+    connection.connection_data.type === ConnectionType.MS_SQL
+  ) {
+    return Object.assign(baseFormData, {
+      ...connection.connection_data,
+      ...connection.auth_data,
+    });
+  }
+  if (
+    connection.auth_data.type === ConnectionType.MY_SQL &&
+    connection.connection_data.type === ConnectionType.MY_SQL
+  ) {
+    return Object.assign(baseFormData, {
+      ...connection.connection_data,
+      ...connection.auth_data,
+    });
+  }
+  if (
+    connection.auth_data.type === ConnectionType.CLICKHOUSE &&
+    connection.connection_data.type === ConnectionType.CLICKHOUSE
+  ) {
+    return Object.assign(baseFormData, {
+      ...connection.connection_data,
+      ...connection.auth_data,
+    });
+  }
   return {
     name: connection.name,
     description: connection.description,

src/features/transfer/TransferDetailInfo/components/TransferParams/index.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Descriptions } from 'antd';
+import { CONNECTION_TYPE_NAMES } from '@entities/connection';
 
 import { TransferParamsProps } from './types';
 import { getDescriptionItems } from './utils';
@@ -8,7 +9,7 @@ export const TransferParams = ({ data, ...props }: TransferParamsProps) => {
   return (
     <Descriptions {...props}>
       <Descriptions.Item label="Type" span={3}>
-        {data.type}
+        {CONNECTION_TYPE_NAMES[data.type]}
       </Descriptions.Item>
       {getDescriptionItems({ data }).map((item, index) => (
         <Descriptions.Item label={item.label} span={3} key={index}>

src/features/transfer/TransferDetailInfo/components/TransferParams/utils/getDescriptionItems/index.tsx

@@ -23,6 +23,9 @@ export const getDescriptionItems = ({ data }: GetDescriptionItemsProps): Descrip
     case ConnectionType.HIVE:
     case ConnectionType.ORACLE:
     case ConnectionType.POSTGRES:
+    case ConnectionType.CLICKHOUSE:
+    case ConnectionType.MY_SQL:
+    case ConnectionType.MS_SQL:
       return [
         {
           label: 'Table name',

src/shared/types/connection.ts

@@ -1,10 +1,10 @@
 export enum ConnectionType {
-  HIVE = 'hive',
+  CLICKHOUSE = 'clickhouse',
   HDFS = 'hdfs',
+  HIVE = 'hive',
+  MS_SQL = 'mssql',
+  MY_SQL = 'mysql',
   ORACLE = 'oracle',
   POSTGRES = 'postgres',
-  CLICKHOUSE = 'clickhouse',
-  MY_SQL = 'mysql',
-  MS_SQL = 'mssql',
   S3 = 's3',
 }