Skip to content

Commit 05a3ad3

Browse files
dolfinusdolfinus
committed
Improve enum naming
1 parent 9b5986b commit 05a3ad3

File tree

13 files changed

+65
-65
lines changed

13 files changed

+65
-65
lines changed

‎src/entities/connection/api/types.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export interface ConnectionClickhouse {
103103
}
104104

105105
export interface ConnectionMySql {
106-
type: ConnectionType.MY_SQL;
106+
type: ConnectionType.MYSQL;
107107
auth_data: ConnectionAuthBasic;
108108
connection_data: {
109109
host: string;
@@ -113,7 +113,7 @@ export interface ConnectionMySql {
113113
}
114114

115115
export interface ConnectionMsSql {
116-
type: ConnectionType.MS_SQL;
116+
type: ConnectionType.MSSQL;
117117
auth_data: ConnectionAuthBasic;
118118
connection_data: {
119119
host: string;

‎src/entities/connection/constants.tsx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,35 @@ import {
1919
import { ConnectionBucketStyle, ConnectionProtocol } from './api';
2020

2121
export const CONNECTION_TYPE_NAMES: Record<ConnectionType, string> = {
22+
[ConnectionType.CLICKHOUSE]: 'ClickHouse',
2223
[ConnectionType.FTP]: 'FTP',
2324
[ConnectionType.FTPS]: 'FTPS',
24-
[ConnectionType.SFTP]: 'SFTP',
25-
[ConnectionType.WEBDAV]: 'WebDAV',
26-
[ConnectionType.SAMBA]: 'Samba',
2725
[ConnectionType.HDFS]: 'HDFS',
28-
[ConnectionType.S3]: 'S3',
29-
[ConnectionType.CLICKHOUSE]: 'ClickHouse',
3026
[ConnectionType.HIVE]: 'Hive',
31-
[ConnectionType.MS_SQL]: 'MSSQL',
32-
[ConnectionType.MY_SQL]: 'MySQL',
27+
[ConnectionType.MSSQL]: 'MSSQL',
28+
[ConnectionType.MYSQL]: 'MySQL',
3329
[ConnectionType.ORACLE]: 'Oracle',
3430
[ConnectionType.POSTGRES]: 'Postgres',
31+
[ConnectionType.S3]: 'S3',
32+
[ConnectionType.SAMBA]: 'Samba',
33+
[ConnectionType.SFTP]: 'SFTP',
34+
[ConnectionType.WEBDAV]: 'WebDAV',
3535
};
3636

3737
export const CONNECTION_ICONS: Record<ConnectionType, ReactNode> = {
38+
[ConnectionType.CLICKHOUSE]: <ClickhouseIcon />,
3839
[ConnectionType.FTP]: <FtpIcon />,
3940
[ConnectionType.FTPS]: <FtpIcon />,
40-
[ConnectionType.SFTP]: <SftpIcon />,
41-
[ConnectionType.WEBDAV]: <WebDavIcon />,
42-
[ConnectionType.SAMBA]: <SambaIcon />,
4341
[ConnectionType.HDFS]: <HdfsIcon />,
44-
[ConnectionType.S3]: <S3Icon />,
45-
[ConnectionType.CLICKHOUSE]: <ClickhouseIcon />,
4642
[ConnectionType.HIVE]: <HiveIcon />,
47-
[ConnectionType.MS_SQL]: <MssqlIcon />,
48-
[ConnectionType.MY_SQL]: <MysqlIcon />,
43+
[ConnectionType.MSSQL]: <MssqlIcon />,
44+
[ConnectionType.MYSQL]: <MysqlIcon />,
4945
[ConnectionType.ORACLE]: <OracleIcon />,
5046
[ConnectionType.POSTGRES]: <PostgresIcon />,
47+
[ConnectionType.S3]: <S3Icon />,
48+
[ConnectionType.SAMBA]: <SambaIcon />,
49+
[ConnectionType.SFTP]: <SftpIcon />,
50+
[ConnectionType.WEBDAV]: <WebDavIcon />,
5151
};
5252

5353
export const CONNECTION_TYPE_SELECT_OPTIONS = prepareOptionsForSelect({
@@ -57,13 +57,13 @@ export const CONNECTION_TYPE_SELECT_OPTIONS = prepareOptionsForSelect({
5757
{ value: ConnectionType.FTPS, label: CONNECTION_TYPE_NAMES[ConnectionType.FTPS] },
5858
{ value: ConnectionType.HDFS, label: CONNECTION_TYPE_NAMES[ConnectionType.HDFS] },
5959
{ value: ConnectionType.HIVE, label: CONNECTION_TYPE_NAMES[ConnectionType.HIVE] },
60-
{ value: ConnectionType.MS_SQL, label: CONNECTION_TYPE_NAMES[ConnectionType.MS_SQL] },
61-
{ value: ConnectionType.MY_SQL, label: CONNECTION_TYPE_NAMES[ConnectionType.MY_SQL] },
60+
{ value: ConnectionType.MSSQL, label: CONNECTION_TYPE_NAMES[ConnectionType.MSSQL] },
61+
{ value: ConnectionType.MYSQL, label: CONNECTION_TYPE_NAMES[ConnectionType.MYSQL] },
6262
{ value: ConnectionType.ORACLE, label: CONNECTION_TYPE_NAMES[ConnectionType.ORACLE] },
6363
{ value: ConnectionType.POSTGRES, label: CONNECTION_TYPE_NAMES[ConnectionType.POSTGRES] },
64+
{ value: ConnectionType.S3, label: CONNECTION_TYPE_NAMES[ConnectionType.S3] },
6465
{ value: ConnectionType.SAMBA, label: CONNECTION_TYPE_NAMES[ConnectionType.SAMBA] },
6566
{ value: ConnectionType.SFTP, label: CONNECTION_TYPE_NAMES[ConnectionType.SFTP] },
66-
{ value: ConnectionType.S3, label: CONNECTION_TYPE_NAMES[ConnectionType.S3] },
6767
{ value: ConnectionType.WEBDAV, label: CONNECTION_TYPE_NAMES[ConnectionType.WEBDAV] },
6868
],
6969
renderLabel: (data) => data.label,

‎src/entities/connection/ui/ConnectionTypeForm/constants.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ export const CONNECTION_TYPE_COMPONENT = {
4242
[ConnectionType.ORACLE]: <ConnectionOracle />,
4343
[ConnectionType.POSTGRES]: <ConnectionPostgres />,
4444
[ConnectionType.CLICKHOUSE]: <ConnectionClickhouse />,
45-
[ConnectionType.MY_SQL]: <ConnectionMySql />,
46-
[ConnectionType.MS_SQL]: <ConnectionMsSql />,
45+
[ConnectionType.MYSQL]: <ConnectionMySql />,
46+
[ConnectionType.MSSQL]: <ConnectionMsSql />,
4747
};

‎src/entities/connection/ui/ConnectionTypeForm/hooks/useSelectConnectionType/index.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ export const useSelectConnectionType = ({ initialType }: UseSelectConnectionType
1212

1313
const getAuthDataTypeValue = (type: ConnectionType): ConnectionAuthType => {
1414
switch (type) {
15+
case ConnectionType.CLICKHOUSE:
1516
case ConnectionType.FTP:
1617
case ConnectionType.FTPS:
17-
case ConnectionType.SFTP:
18-
case ConnectionType.WEBDAV:
19-
case ConnectionType.CLICKHOUSE:
2018
case ConnectionType.HDFS:
2119
case ConnectionType.HIVE:
22-
case ConnectionType.MS_SQL:
23-
case ConnectionType.MY_SQL:
20+
case ConnectionType.MSSQL:
21+
case ConnectionType.MYSQL:
2422
case ConnectionType.ORACLE:
2523
case ConnectionType.POSTGRES:
24+
case ConnectionType.SFTP:
25+
case ConnectionType.WEBDAV:
2626
return ConnectionAuthType.BASIC;
2727
case ConnectionType.S3:
2828
return ConnectionAuthType.S3;

‎src/entities/transfer/api/types.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,22 @@ export interface TransferTargetConnectionFileType {
5959
type:
6060
| ConnectionType.FTP
6161
| ConnectionType.FTPS
62-
| ConnectionType.SFTP
6362
| ConnectionType.HDFS
64-
| ConnectionType.WEBDAV
63+
| ConnectionType.S3
6564
| ConnectionType.SAMBA
66-
| ConnectionType.S3;
65+
| ConnectionType.SFTP
66+
| ConnectionType.WEBDAV;
6767
directory_path: string;
6868
file_format: Exclude<FileFormat, Json>;
6969
file_name_template: string;
7070
}
7171

7272
interface TransferConnectionTableType {
7373
type:
74-
| ConnectionType.HIVE
7574
| ConnectionType.CLICKHOUSE
76-
| ConnectionType.MS_SQL
77-
| ConnectionType.MY_SQL
75+
| ConnectionType.HIVE
76+
| ConnectionType.MSSQL
77+
| ConnectionType.MYSQL
7878
| ConnectionType.ORACLE
7979
| ConnectionType.POSTGRES;
8080
table_name: string;

‎src/features/connection/ConnectionDetailInfo/utils/getConnectionAuthData/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ export const getConnectionAuthData = (connection: Connection, t: TFunction<'conn
2525
content: auth_data.auth_type,
2626
},
2727
];
28+
case ConnectionType.CLICKHOUSE:
2829
case ConnectionType.FTP:
2930
case ConnectionType.FTPS:
30-
case ConnectionType.SFTP:
31-
case ConnectionType.WEBDAV:
32-
case ConnectionType.HIVE:
3331
case ConnectionType.HDFS:
32+
case ConnectionType.HIVE:
33+
case ConnectionType.MSSQL:
34+
case ConnectionType.MYSQL:
3435
case ConnectionType.ORACLE:
3536
case ConnectionType.POSTGRES:
36-
case ConnectionType.CLICKHOUSE:
37-
case ConnectionType.MY_SQL:
38-
case ConnectionType.MS_SQL:
37+
case ConnectionType.SFTP:
38+
case ConnectionType.WEBDAV:
3939
return [
4040
{
4141
label: t('username', { ns: 'auth' }),

‎src/features/connection/ConnectionDetailInfo/utils/getConnectionData/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ export const getConnectionData = (connection: Connection, t: TFunction<'connecti
7575
];
7676
case ConnectionType.POSTGRES:
7777
case ConnectionType.CLICKHOUSE:
78-
case ConnectionType.MY_SQL:
79-
case ConnectionType.MS_SQL:
78+
case ConnectionType.MYSQL:
79+
case ConnectionType.MSSQL:
8080
return [
8181
{
8282
label: t('databaseName'),

‎src/features/transfer/MutateTransferForm/components/SourceParams/constants.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { TransferConnectionFileType, TransferConnectionTableType } from '@entiti
55
export const TRANSFER_SOURCE_CONNECTION_TYPE_COMPONENT = {
66
[ConnectionType.FTP]: <TransferConnectionFileType name="source_params" />,
77
[ConnectionType.FTPS]: <TransferConnectionFileType name="source_params" />,
8-
[ConnectionType.SFTP]: <TransferConnectionFileType name="source_params" />,
9-
[ConnectionType.WEBDAV]: <TransferConnectionFileType name="source_params" />,
10-
[ConnectionType.SAMBA]: <TransferConnectionFileType name="source_params" />,
118
[ConnectionType.HDFS]: <TransferConnectionFileType name="source_params" />,
129
[ConnectionType.S3]: <TransferConnectionFileType name="source_params" />,
10+
[ConnectionType.SAMBA]: <TransferConnectionFileType name="source_params" />,
11+
[ConnectionType.SFTP]: <TransferConnectionFileType name="source_params" />,
12+
[ConnectionType.WEBDAV]: <TransferConnectionFileType name="source_params" />,
13+
[ConnectionType.CLICKHOUSE]: <TransferConnectionTableType name="source_params" />,
1314
[ConnectionType.HIVE]: <TransferConnectionTableType name="source_params" />,
15+
[ConnectionType.MSSQL]: <TransferConnectionTableType name="source_params" />,
16+
[ConnectionType.MYSQL]: <TransferConnectionTableType name="source_params" />,
1417
[ConnectionType.ORACLE]: <TransferConnectionTableType name="source_params" />,
1518
[ConnectionType.POSTGRES]: <TransferConnectionTableType name="source_params" />,
16-
[ConnectionType.CLICKHOUSE]: <TransferConnectionTableType name="source_params" />,
17-
[ConnectionType.MY_SQL]: <TransferConnectionTableType name="source_params" />,
18-
[ConnectionType.MS_SQL]: <TransferConnectionTableType name="source_params" />,
1919
};

‎src/features/transfer/MutateTransferForm/components/StrategyParams/components/IncrementByForm/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ export const IncrementByForm = ({ sourceConnectionType }: IncrementByFormProps)
1414
switch (sourceConnectionType) {
1515
case ConnectionType.CLICKHOUSE:
1616
case ConnectionType.HIVE:
17-
case ConnectionType.MS_SQL:
18-
case ConnectionType.MY_SQL:
17+
case ConnectionType.MSSQL:
18+
case ConnectionType.MYSQL:
1919
case ConnectionType.ORACLE:
2020
case ConnectionType.POSTGRES:
2121
return (
@@ -25,9 +25,9 @@ export const IncrementByForm = ({ sourceConnectionType }: IncrementByFormProps)
2525
);
2626
case ConnectionType.FTP:
2727
case ConnectionType.FTPS:
28+
case ConnectionType.SAMBA:
2829
case ConnectionType.SFTP:
2930
case ConnectionType.WEBDAV:
30-
case ConnectionType.SAMBA:
3131
return (
3232
<Form.Item label={t('incrementBy')} name={['strategy_params', 'increment_by']} rules={[{ required: true }]}>
3333
<Select size="large" options={incrementBySelectOptions} placeholder={t('selectIncrementBy')} />

‎src/features/transfer/MutateTransferForm/components/StrategyParams/components/StrategyTypeForm/index.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ export const StrategyTypeForm = ({ sourceConnectionType }: StrategyTypeFormProps
2121
case ConnectionType.S3:
2222
setDisabled(true);
2323
return formInstance.setFieldValue(['strategy_params', 'type'], 'full');
24+
case ConnectionType.CLICKHOUSE:
2425
case ConnectionType.FTP:
2526
case ConnectionType.FTPS:
26-
case ConnectionType.SFTP:
27-
case ConnectionType.WEBDAV:
28-
case ConnectionType.SAMBA:
29-
case ConnectionType.CLICKHOUSE:
3027
case ConnectionType.HIVE:
31-
case ConnectionType.MS_SQL:
32-
case ConnectionType.MY_SQL:
28+
case ConnectionType.MSSQL:
29+
case ConnectionType.MYSQL:
3330
case ConnectionType.ORACLE:
3431
case ConnectionType.POSTGRES:
32+
case ConnectionType.SAMBA:
33+
case ConnectionType.SFTP:
34+
case ConnectionType.WEBDAV:
3535
return setDisabled(false);
3636
}
3737
}, [formInstance, sourceConnectionType]);

0 commit comments

Comments
 (0)