EVEREST-1306: fix strings to numbers (#759)

percona · Jan 10, 2025 · 260790e · 260790e
1 parent ab633f8
commit 260790e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/ui/apps/everest/src/components/cluster-form/resources/constants.ts b/ui/apps/everest/src/components/cluster-form/resources/constants.ts
@@ -156,16 +156,18 @@ export const PROXIES_DEFAULT_SIZES = {
   },
 };
 
-export const DEFAULT_CONFIG_SERVERS = ['1', '3', '5', '7'];
+export const DEFAULT_CONFIG_SERVERS = [1, 3, 5, 7];
 
 export const MIN_NUMBER_OF_SHARDS = '1';
 
 export const getDefaultNumberOfconfigServersByNumberOfNodes = (
   numberOfNodes: number
 ) => {
-  if (DEFAULT_CONFIG_SERVERS.includes(numberOfNodes.toString())) {
-    return numberOfNodes.toString();
-  } else return '7';
+  if (DEFAULT_CONFIG_SERVERS.includes(numberOfNodes)) {
+    return numberOfNodes;
+  } else {
+    return 7;
+  }
 };
 
 const numberOfResourcesValidator = (
@@ -193,7 +195,7 @@ export const resourcesFormSchema = (
 ) => {
   const objectShape = {
     [DbWizardFormFields.shardNr]: z.string().optional(),
-    [DbWizardFormFields.shardConfigServers]: z.string().optional(),
+    [DbWizardFormFields.shardConfigServers]: z.number().optional(),
     [DbWizardFormFields.cpu]: resourceToNumber(0.6),
     [DbWizardFormFields.memory]: resourceToNumber(0.512),
     [DbWizardFormFields.disk]: resourceToNumber(1),
@@ -284,7 +286,7 @@ export const resourcesFormSchema = (
       if (sharding as boolean) {
         const intShardNr = parseInt(shardNr || '', 10);
         const intShardNrMin = +MIN_NUMBER_OF_SHARDS;
-        const intShardConfigServers = parseInt(shardConfigServers || '', 10);
+        const intShardConfigServers = shardConfigServers;
 
         if (Number.isNaN(intShardNr) || intShardNr < 0) {
           ctx.addIssue({

diff --git a/ui/apps/everest/src/components/cluster-form/resources/resources.tsx b/ui/apps/everest/src/components/cluster-form/resources/resources.tsx
@@ -648,6 +648,10 @@ const ResourcesForm = ({
               name={DbWizardFormFields.shardConfigServers}
               toggleButtonGroupProps={{
                 size: 'small',
+                onChange: (_, value) => {
+                  setValue(DbWizardFormFields.shardConfigServers, value);
+                  trigger(DbWizardFormFields.shardConfigServers);
+                },
               }}
             >
               {DEFAULT_CONFIG_SERVERS.map((number) => (
@@ -659,7 +663,7 @@ const ResourcesForm = ({
                   key={number}
                   value={number}
                   onClick={() => {
-                    if (number !== shardConfigServers.toString()) {
+                    if (number !== shardConfigServers) {
                       setValue(DbWizardFormFields.shardConfigServers, number, {
                         shouldValidate: true,
                       });

diff --git a/ui/apps/everest/src/hooks/api/db-cluster/useUpdateDbCluster.ts b/ui/apps/everest/src/hooks/api/db-cluster/useUpdateDbCluster.ts
@@ -192,7 +192,7 @@ export const useUpdateDbClusterResources = () =>
         numberOfProxies: number;
       };
       sharding?: boolean;
-      shardConfigServers?: string;
+      shardConfigServers?: number;
       shardNr?: string;
     }) =>
       updateDbCluster(dbCluster.metadata.name, dbCluster.metadata.namespace, {
@@ -229,7 +229,7 @@ export const useUpdateDbClusterResources = () =>
                 enabled: sharding,
                 shards: +(shardNr ?? MIN_NUMBER_OF_SHARDS),
                 configServer: {
-                  replicas: +(shardConfigServers ?? 3),
+                  replicas: shardConfigServers ?? 3,
                 },
               },
             }),

diff --git a/ui/apps/everest/src/pages/database-form/database-form.utils.ts b/ui/apps/everest/src/pages/database-form/database-form.utils.ts
@@ -104,10 +104,9 @@ export const DbClusterPayloadToFormValues = (
         )
       : ResourceSize.small,
     [DbWizardFormFields.sharding]: dbCluster?.spec?.sharding?.enabled || false,
-    [DbWizardFormFields.shardConfigServers]: (
+    [DbWizardFormFields.shardConfigServers]:
       sharding?.configServer?.replicas ||
-      getDefaultNumberOfconfigServersByNumberOfNodes(+numberOfNodes)
-    ).toString(),
+      getDefaultNumberOfconfigServersByNumberOfNodes(+numberOfNodes),
     [DbWizardFormFields.shardNr]: (
       sharding?.shards ||
       (DB_WIZARD_DEFAULTS[DbWizardFormFields.shardNr] as string)

diff --git a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/resources-details.tsx b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/resources-details.tsx
@@ -257,7 +257,7 @@ export const ResourcesDetails = ({
             proxyMemory: memoryParser(proxyMemory.toString(), 'G').value,
             sharding: !!sharding?.enabled,
             ...(!!sharding?.enabled && {
-              shardConfigServers: sharding?.configServer?.replicas.toString(),
+              shardConfigServers: sharding?.configServer?.replicas,
               shardNr: sharding?.shards.toString(),
             }),
             numberOfNodes: numberOfNodesStr,

diff --git a/ui/packages/ui-lib/src/form/inputs/toggle-button-group/toggle-button-group.tsx b/ui/packages/ui-lib/src/form/inputs/toggle-button-group/toggle-button-group.tsx
@@ -42,7 +42,17 @@ const ToggleButtonGroupInput = ({
             value: any
           ) => {
             if (value !== null) {
-              toggleButtonGroupOnChange(event, event.target.value);
+              const isNumber = typeof value === 'number';
+              if (isNumber) {
+                event.target.valueAsNumber = value;
+              } else {
+                event.target.value = value;
+              }
+
+              toggleButtonGroupOnChange(
+                event,
+                isNumber ? event.target.valueAsNumber : event.target.value
+              );
               setValue(name, value, { shouldTouch: true });
             }
           }}