refactor: refactored some functions and field names

Rainbrand · Rainbrand · commit a9fe3cbb683a · 2025-11-15T05:08:59.000+03:00
diff --git a/console/ui/.eslintrc.cjs b/console/ui/.eslintrc.cjs
@@ -22,6 +22,5 @@ module.exports = {
     'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
     '@typescript-eslint/no-misused-promises': 'off',
     '@typescript-eslint/no-unsafe-argument': 'off',
-    'react-hooks/exhaustive-deps': 'off',
   },
 };
diff --git a/console/ui/src/entities/cluster/database-servers-block/model/const.ts b/console/ui/src/entities/cluster/database-servers-block/model/const.ts
@@ -1,8 +1,8 @@
 export const DATABASE_SERVERS_FIELD_NAMES = Object.freeze({
-  IS_CLUSTER_EXISTS: 'existingCluster',
+  IS_CLUSTER_EXISTS: 'databaseServerExistingCluster',
   DATABASE_SERVERS: 'databaseServers',
   DATABASE_HOSTNAME: 'databaseServerHostname',
-  IP_ADDRESS: 'databaseServerIpAddress',
-  LOCATION: 'location',
-  IS_POSTGRESQL_EXISTS: 'isPostgreSQLExist',
+  DATABASE_IP_ADDRESS: 'databaseServerIpAddress',
+  DATABASE_LOCATION: 'databaseServerLocation',
+  IS_POSTGRESQL_EXISTS: 'databaseServerIsPostgreSQLExist',
 });
diff --git a/console/ui/src/entities/cluster/database-servers-block/model/types.ts b/console/ui/src/entities/cluster/database-servers-block/model/types.ts
@@ -10,8 +10,8 @@ export interface DatabaseServerBlockValues {
   [DATABASE_SERVERS_FIELD_NAMES.IS_CLUSTER_EXISTS]?: boolean;
   [DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS]: {
     [DATABASE_SERVERS_FIELD_NAMES.DATABASE_HOSTNAME]: string;
-    [DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS]: string;
-    [DATABASE_SERVERS_FIELD_NAMES.LOCATION]: string;
+    [DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS]: string;
+    [DATABASE_SERVERS_FIELD_NAMES.DATABASE_LOCATION]: string;
     [DATABASE_SERVERS_FIELD_NAMES.IS_POSTGRESQL_EXISTS]?: boolean;
   }[];
 }
diff --git a/console/ui/src/entities/cluster/database-servers-block/model/validation.ts b/console/ui/src/entities/cluster/database-servers-block/model/validation.ts
@@ -16,13 +16,13 @@ export const databaseServersBlockValidation = (t: TFunction) =>
                 [DATABASE_SERVERS_FIELD_NAMES.DATABASE_HOSTNAME]: yup
                   .string()
                   .required(t('requiredField', { ns: 'validation' })),
-                [DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS]: yup
+                [DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS]: yup
                   .string()
                   .required(t('requiredField', { ns: 'validation' }))
                   .test('should be a correct IP', t('shouldBeACorrectV4Ip', { ns: 'validation' }), (value) =>
                     ipRegex.v4({ exact: true }).test(value),
                   ),
-                [DATABASE_SERVERS_FIELD_NAMES.LOCATION]: yup.string(),
+                [DATABASE_SERVERS_FIELD_NAMES.DATABASE_LOCATION]: yup.string(),
               }),
             )
           : schema.notRequired(),
diff --git a/console/ui/src/entities/cluster/database-servers-block/ui/DatabaseServerBox.tsx b/console/ui/src/entities/cluster/database-servers-block/ui/DatabaseServerBox.tsx
@@ -49,7 +49,7 @@ const DatabaseServerBox: FC<DatabaseServerBlockProps> = ({ index, remove }) => {
         />
         <Controller
           control={control}
-          name={`${DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS}.${index}.${DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS}`}
+          name={`${DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS}.${index}.${DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS}`}
           render={({ field: { value, onChange } }) => (
             <TextField
               required
@@ -59,20 +59,20 @@ const DatabaseServerBox: FC<DatabaseServerBlockProps> = ({ index, remove }) => {
               label={t('ipAddress', { ns: 'clusters' })}
               error={
                 !!errors[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS]?.[index]?.[
-                  DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS
+                  DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS
                 ]
               }
               helperText={
                 errors?.[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS]?.[index]?.[
-                  DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS
+                  DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS
                 ]?.message ?? ' '
               }
             />
           )}
         />
         <Controller
           control={control}
-          name={`${DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS}.${index}.${DATABASE_SERVERS_FIELD_NAMES.LOCATION}`}
+          name={`${DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS}.${index}.${DATABASE_SERVERS_FIELD_NAMES.DATABASE_LOCATION}`}
           render={({ field: { value, onChange } }) => (
             <TextField
               value={value}
diff --git a/console/ui/src/entities/cluster/expert-mode/dcs-block/model/const.ts b/console/ui/src/entities/cluster/expert-mode/dcs-block/model/const.ts
@@ -14,7 +14,7 @@ export const DCS_DATABASES_DEFAULT_VALUES = Object.freeze({
   [DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_PORT]: '2379',
 });
 
-export const DCS_TYPES = Object.freeze(['etcd', 'consul']);
+export const DCS_TYPES = Object.freeze({ ETCD: 'etcd', CONSUL: 'consul' });
 
 export const getCorrectFields = ({ watchIsDeployToDcsCluster, watchIsDeployToDbServers, watchDcsType, t }) => {
   const fields = [];
@@ -24,7 +24,7 @@ export const getCorrectFields = ({ watchIsDeployToDcsCluster, watchIsDeployToDbS
       fieldName: DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_IP_ADDRESS,
       label: t('ipAddress'),
     });
-    if (watchDcsType === DCS_TYPES[0]) {
+    if (watchDcsType === DCS_TYPES.ETCD) {
       fields.push({ fieldName: DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_PORT, label: t('port') });
     }
   }
diff --git a/console/ui/src/entities/cluster/expert-mode/dcs-block/ui/index.tsx b/console/ui/src/entities/cluster/expert-mode/dcs-block/ui/index.tsx
@@ -62,7 +62,7 @@ const DcsBlock: FC = () => {
             <FormControl fullWidth size="small">
               <InputLabel size="small">{t('dcsType')}</InputLabel>
               <Select {...field} size="small" label={t('dcsType')} error={!!errors[DCS_BLOCK_FIELD_NAMES.TYPE]}>
-                {DCS_TYPES.map((mode) => (
+                {Object.values(DCS_TYPES).map((mode) => (
                   <MenuItem key={mode} value={mode}>
                     {mode}
                   </MenuItem>
diff --git a/console/ui/src/entities/extensions-block/assets/citus.png b/console/ui/src/entities/extensions-block/assets/citus.png
diff --git a/console/ui/src/entities/extensions-block/assets/pgaudit.png b/console/ui/src/entities/extensions-block/assets/pgaudit.png
diff --git a/console/ui/src/entities/extensions-block/assets/pgrouting.png b/console/ui/src/entities/extensions-block/assets/pgrouting.png
diff --git a/console/ui/src/entities/extensions-block/assets/postgis.png b/console/ui/src/entities/extensions-block/assets/postgis.png
diff --git a/console/ui/src/entities/extensions-block/assets/timescaledb.png b/console/ui/src/entities/extensions-block/assets/timescaledb.png
diff --git a/console/ui/src/shared/lib/clusterValuesTransformFunctions.ts b/console/ui/src/shared/lib/clusterValuesTransformFunctions.ts
@@ -112,7 +112,7 @@ export const getLocalMachineExtraVars = (values: ClusterFormValues, secretId?: n
         ...(!values[DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_NEW_CLUSTER]
           ? {
               dcs_exists: true,
-              ...(values[DCS_BLOCK_FIELD_NAMES.TYPE] === DCS_TYPES[0]
+              ...(values[DCS_BLOCK_FIELD_NAMES.TYPE] === DCS_TYPES.ETCD
                 ? {
                     patroni_etcd_hosts: values?.[DCS_BLOCK_FIELD_NAMES.DCS_DATABASES]?.map((database) => ({
                       host: database[DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_IP_ADDRESS],
@@ -132,73 +132,88 @@ export const getLocalMachineExtraVars = (values: ClusterFormValues, secretId?: n
     : {}),
 });
 
-const configureDcsHosts = ({
+/**
+ * Function maps a field array into correct request format for DCS config.
+ * @param values - Filled form values.
+ * @param role - Optional role for Consul instances.
+ * @param shouldAddHostname - An optional flag determines if field 'hostname' should be added. True by default.
+ * @param isDbServers - An optional flag determines which db servers are mapping - Database servers or DCS. True by default.
+ */
+const configureHosts = ({
   values,
   role,
-  isAddHostname = false,
+  shouldAddHostname = false,
+  isDbServers = true,
 }: {
   values: ClusterFormValues;
   role?: string;
-  isAddHostname?: boolean;
+  shouldAddHostname?: boolean;
+  isDbServers?: boolean;
 }) => {
-  return values[DCS_BLOCK_FIELD_NAMES.DCS_DATABASES].reduce(
-    (acc, server) => ({
-      ...acc,
-      [server[DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_IP_ADDRESS]]: {
-        ansible_host: server[DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_IP_ADDRESS],
-        ...(isAddHostname ? { hostname: server[DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_HOSTNAME] } : {}),
-        ...(role ? { consul_node_role: role } : {}),
-      },
-    }),
-    {},
-  );
-};
+  const dbServersKeys = {
+    servers: DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS,
+    ipAddress: DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS,
+  };
 
-const configureDatabaseServersHosts = ({ values, role }: { values: ClusterFormValues; role?: string }) => {
-  return values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS].reduce(
+  const dcsHostsKeys = {
+    servers: DCS_BLOCK_FIELD_NAMES.DCS_DATABASES,
+    ipAddress: DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_IP_ADDRESS,
+    hostname: DCS_BLOCK_FIELD_NAMES.DCS_DATABASE_HOSTNAME,
+  };
+
+  const usedKeys = isDbServers ? dbServersKeys : dcsHostsKeys;
+
+  return values[usedKeys.servers].reduce(
     (acc, server) => ({
       ...acc,
-      [server[DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS]]: {
-        ansible_host: server[DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS],
+      [server[usedKeys.ipAddress]]: {
+        ansible_host: server[usedKeys.ipAddress],
+        ...(shouldAddHostname && usedKeys?.hostname ? { hostname: server[usedKeys.hostname] } : {}),
         ...(role ? { consul_node_role: role } : {}),
       },
     }),
     {},
   );
 };
 
+/**
+ * Function maps DCS fields into the correct request format.
+ * @param values - Filled form values.
+ */
 const constructDcsEnvs = (values: ClusterFormValues) => {
   if (values[DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_NEW_CLUSTER]) {
     if (!IS_EXPERT_MODE) {
       return {
         etcd_cluster: {
-          hosts: configureDatabaseServersHosts({ values }),
+          hosts: configureHosts({ values }),
         },
         consul_instances: { hosts: {} },
       };
     }
     if (IS_EXPERT_MODE) {
       switch (values[DCS_BLOCK_FIELD_NAMES.TYPE]) {
-        case DCS_TYPES[0]:
+        case DCS_TYPES.ETCD:
           return {
             etcd_cluster: {
-              hosts: values[DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_TO_DB_SERVERS]
-                ? configureDatabaseServersHosts({ values })
-                : configureDcsHosts({ values, isAddHostname: true }),
+              hosts: configureHosts({
+                values,
+                isDbServers: values[DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_TO_DB_SERVERS],
+                shouldAddHostname: !values[DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_TO_DB_SERVERS],
+              }),
             },
             consul_instances: { hosts: {} },
           };
-        case DCS_TYPES[1]:
+        case DCS_TYPES.CONSUL:
           return {
             etcd_cluster: {
               hosts: {},
             },
             consul_instances: {
               hosts: values[DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_TO_DB_SERVERS]
-                ? configureDatabaseServersHosts({ values, role: 'server' })
+                ? configureHosts({ values, role: 'server' })
                 : {
-                    ...configureDatabaseServersHosts({ values, role: 'client' }),
-                    ...configureDcsHosts({ values, role: 'server', isAddHostname: true }),
+                    ...configureHosts({ values, role: 'client' }),
+                    ...configureHosts({ values, role: 'server', isDbServers: false, shouldAddHostname: true }),
                   },
             },
           };
@@ -213,16 +228,20 @@ const constructDcsEnvs = (values: ClusterFormValues) => {
     }
   }
   if (IS_EXPERT_MODE && !values[DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_NEW_CLUSTER]) {
-    if (values[DCS_BLOCK_FIELD_NAMES.TYPE] === DCS_TYPES[1]) {
+    if (values[DCS_BLOCK_FIELD_NAMES.TYPE] === DCS_TYPES.CONSUL) {
       return {
         consul_instances: {
-          hosts: configureDcsHosts({ values, role: 'server', isAddHostname: false }),
+          hosts: configureHosts({ values, role: 'server', isDbServers: false }),
         },
       };
     }
   }
 };
 
+/**
+ * Function maps Load Balancers block form values into correct request format.
+ * @param values - Filled form values.
+ */
 const constructBalancersEnvs = (values: ClusterFormValues) => {
   let balancerHosts = {};
 
@@ -241,8 +260,8 @@ const constructBalancersEnvs = (values: ClusterFormValues) => {
       balancerHosts = values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS].reduce(
         (acc, server) => ({
           ...acc,
-          [server[DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS]]: {
-            ansible_host: server[DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS],
+          [server[DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS]]: {
+            ansible_host: server[DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS],
           },
         }),
         {},
@@ -286,15 +305,21 @@ export const getLocalMachineEnvs = (values: ClusterFormValues, secretId?: number
         ...constructDcsEnvs(values),
         master: {
           hosts: {
-            [values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS][0][DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS]]: {
+            [values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS][0][
+              DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS
+            ]]: {
               hostname:
                 values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS][0][
                   DATABASE_SERVERS_FIELD_NAMES.DATABASE_HOSTNAME
                 ],
               ansible_host:
-                values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS][0][DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS],
+                values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS][0][
+                  DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS
+                ],
               server_location:
-                values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS]?.[0]?.[DATABASE_SERVERS_FIELD_NAMES.LOCATION],
+                values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS]?.[0]?.[
+                  DATABASE_SERVERS_FIELD_NAMES.DATABASE_LOCATION
+                ],
               postgresql_exists: IS_EXPERT_MODE
                 ? values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS]?.[0]?.[
                     DATABASE_SERVERS_FIELD_NAMES.IS_POSTGRESQL_EXISTS
@@ -309,10 +334,10 @@ export const getLocalMachineEnvs = (values: ClusterFormValues, secretId?: number
                 hosts: values[DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS].slice(1).reduce(
                   (acc, server) => ({
                     ...acc,
-                    [server[DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS]]: {
+                    [server[DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS]]: {
                       hostname: server?.[DATABASE_SERVERS_FIELD_NAMES.DATABASE_HOSTNAME],
-                      ansible_host: server?.[DATABASE_SERVERS_FIELD_NAMES.IP_ADDRESS],
-                      server_location: server?.[DATABASE_SERVERS_FIELD_NAMES.LOCATION],
+                      ansible_host: server?.[DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS],
+                      server_location: server?.[DATABASE_SERVERS_FIELD_NAMES.DATABASE_LOCATION],
                       postgresql_exists: IS_EXPERT_MODE
                         ? server?.[DATABASE_SERVERS_FIELD_NAMES.IS_POSTGRESQL_EXISTS]
                         : (values[DATABASE_SERVERS_FIELD_NAMES.IS_CLUSTER_EXISTS] ?? false),
diff --git a/console/ui/src/widgets/cluster-form/model/constants.ts b/console/ui/src/widgets/cluster-form/model/constants.ts
@@ -43,7 +43,6 @@ const CLUSTER_CLOUD_PROVIDER_FIELD_NAMES = Object.freeze({
 
 const CLUSTER_LOCAL_MACHINE_FIELD_NAMES = Object.freeze({
   EXISTING_CLUSTER: 'existingCluster',
-  HOSTNAME: 'hostname',
   AUTHENTICATION_METHOD: 'authenticationMethod',
   SECRET_KEY_NAME: 'secretKeyName',
   AUTHENTICATION_IS_SAVE_TO_CONSOLE: 'authenticationSaveToConsole',
@@ -92,7 +91,7 @@ export const LOCAL_CLUSTER_DEFAULT_VALUES = Object.freeze({
   [CLUSTER_FORM_FIELD_NAMES.AUTHENTICATION_METHOD]: AUTHENTICATION_METHODS.SSH,
   ...(IS_EXPERT_MODE
     ? {
-        [DCS_BLOCK_FIELD_NAMES.TYPE]: DCS_TYPES[0],
+        [DCS_BLOCK_FIELD_NAMES.TYPE]: DCS_TYPES.ETCD,
         [DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_NEW_CLUSTER]: true,
         [DCS_BLOCK_FIELD_NAMES.IS_DEPLOY_TO_DB_SERVERS]: true,
         [DCS_BLOCK_FIELD_NAMES.DCS_DATABASES]: Array(3)
@@ -112,12 +111,12 @@ export const CLUSTER_FORM_DEFAULT_VALUES = Object.freeze({
   [CLUSTER_FORM_FIELD_NAMES.CREATION_TYPE]: CLUSTER_CREATION_TYPES.FORM,
   [CLUSTER_FORM_FIELD_NAMES.IS_USE_DEFINED_SECRET]: false,
   [CLUSTER_FORM_FIELD_NAMES.SECRET_ID]: '',
-  [CLUSTER_FORM_FIELD_NAMES.DATABASE_SERVERS]: Array(3)
+  [DATABASE_SERVERS_FIELD_NAMES.DATABASE_SERVERS]: Array(3)
     .fill(0)
     .map(() => ({
-      [CLUSTER_FORM_FIELD_NAMES.HOSTNAME]: '',
-      [CLUSTER_FORM_FIELD_NAMES.IP_ADDRESS]: '',
-      [CLUSTER_FORM_FIELD_NAMES.LOCATION]: '',
+      [DATABASE_SERVERS_FIELD_NAMES.DATABASE_HOSTNAME]: '',
+      [DATABASE_SERVERS_FIELD_NAMES.DATABASE_IP_ADDRESS]: '',
+      [DATABASE_SERVERS_FIELD_NAMES.DATABASE_LOCATION]: '',
     })),
   ...(IS_EXPERT_MODE
     ? {
diff --git a/console/ui/src/widgets/cluster-form/model/types.ts b/console/ui/src/widgets/cluster-form/model/types.ts
@@ -1,4 +1,3 @@
-import { CLUSTER_FORM_FIELD_NAMES } from '@widgets/cluster-form/model/constants.ts';
 import { ResponseDeploymentInfo } from '@shared/api/api/deployments.ts';
 import { ResponseEnvironment } from '@shared/api/api/environments.ts';
 import { ResponsePostgresVersion } from '@shared/api/api/other.ts';
@@ -14,9 +13,3 @@ export interface ClusterFormRegionConfigBoxProps {
   place: string;
   isActive: boolean;
 }
-
-export interface ClusterDatabaseServer {
-  [CLUSTER_FORM_FIELD_NAMES.HOSTNAME]: string;
-  [CLUSTER_FORM_FIELD_NAMES.IP_ADDRESS]: string;
-  [CLUSTER_FORM_FIELD_NAMES.LOCATION]: string;
-}
