Changed function responsible for trimming leading zeros. (#87)

wttech · Nov 7, 2019 · ad6dd59 · ad6dd59
1 parent 316c99a
commit ad6dd59
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/cogboard-webapp/src/components/BoardForm/index.js b/cogboard-webapp/src/components/BoardForm/index.js
@@ -16,8 +16,14 @@ const BoardForm = ({ onSubmit, renderActions, boardId, ...initialFormValues }) =
   const validationSchema = createValidationSchema(boardId, boards);
   const {values, handleChange, handleSubmit, errors} = useFormData(initialFormValues, validationSchema, true);
 
+  const handleNumberInput = (event) => {
+    const { target: { value } } = event;
+
+    event.target.value = trimLeadingZeros(value);
+  };
+
   return (
-    <form onSubmit={handleSubmit(onSubmit)} novalidate="novalidate">
+    <form onSubmit={handleSubmit(onSubmit)} noValidate="novalidate">
       <StyledFieldset component="fieldset">
         <TextField
           onChange={handleChange('title')}
@@ -28,7 +34,7 @@ const BoardForm = ({ onSubmit, renderActions, boardId, ...initialFormValues }) =
           label="Title"
           margin="normal"
           value={values.title}
-          error={errors.title}
+          error={errors.title !== undefined}
           helperText={
             <StyledValidationMessages
               messages={errors.title}
@@ -38,7 +44,7 @@ const BoardForm = ({ onSubmit, renderActions, boardId, ...initialFormValues }) =
         />
         <NumberInput
           onChange={handleChange('columns')}
-          onInput={trimLeadingZeros}
+          onInput={handleNumberInput}
           id="columns"
           InputLabelProps={{
             shrink: true
@@ -47,7 +53,8 @@ const BoardForm = ({ onSubmit, renderActions, boardId, ...initialFormValues }) =
           label="Columns"
           margin="normal"
           value={values.columns}
-          error={errors.columns}
+          error={errors.columns !== undefined}
+          FormHelperTextProps={{ component: 'div' }}
           helperText={
             <StyledValidationMessages
               messages={errors.columns}
@@ -71,15 +78,16 @@ const BoardForm = ({ onSubmit, renderActions, boardId, ...initialFormValues }) =
         {values.autoSwitch &&
           <NumberInput
             onChange={handleChange('switchInterval')}
-            onInput={trimLeadingZeros}
+            onInput={handleNumberInput}
             id="switchInterval"
             InputLabelProps={{
               shrink: true
             }}
             label="Switch interval [s]"
             margin="normal"
             value={values.switchInterval}
-            error={errors.switchInterval}
+            error={errors.switchInterval !== undefined}
+            FormHelperTextProps={{ component: 'div' }}
             helperText={
               <StyledValidationMessages
                 messages={errors.switchInterval}

diff --git a/cogboard-webapp/src/helpers/index.js b/cogboard-webapp/src/helpers/index.js
@@ -30,9 +30,4 @@ export const parseYupErrors = (errors) => {
   return result;
 };
 
-export const trimLeadingZeros = (event) => {
-  const inputValue = event.target.value;
-  const parsedValue = parseInt(inputValue);
-
-  event.target.value = parsedValue.toString();
-};
+export const trimLeadingZeros = (inputValue) => String(parseInt(inputValue));