Merge pull request #982 from rvsia/fixNumberConversions

fix(renderer): fix numbers conversions

Author: Hyperkid123

packages/react-form-renderer/src/common/index.js

@@ -0,0 +1 @@
+export * from './helpers';

packages/react-form-renderer/src/tests/form-renderer/data-types.test.js

@@ -4,6 +4,8 @@ import FormRenderer from '../../form-renderer';
 import FormTemplate from '../../../../../__mocks__/mock-form-template';
 import componentTypes from '../../component-types';
 import useFieldApi from '../../use-field-api';
+import convertType from '../../use-field-api/convert-type';
+import dataTypes from '../../data-types';
 
 const DataTypeInput = (props) => {
   const { input, type, label } = useFieldApi(props);
@@ -69,4 +71,28 @@ describe('data types', () => {
       expect.anything()
     );
   });
+
+  describe('converTypes', () => {
+    describe('integer', () => {
+      it('converts empty string', () => {
+        expect(convertType(dataTypes.INTEGER, '')).toEqual('');
+      });
+
+      it('converts zero', () => {
+        expect(convertType(dataTypes.INTEGER, '0')).toEqual(0);
+      });
+
+      it('converts an integer', () => {
+        expect(convertType(dataTypes.INTEGER, '12132')).toEqual(12132);
+      });
+
+      it('converts a string', () => {
+        expect(convertType(dataTypes.INTEGER, 'abcd')).toEqual('abcd');
+      });
+
+      it('converts a negative integer', () => {
+        expect(convertType(dataTypes.INTEGER, '-12132')).toEqual(-12132);
+      });
+    });
+  });
 });

packages/react-form-renderer/src/use-field-api/convert-type.js

@@ -12,17 +12,30 @@ const castToBoolean = (value) => {
   return value === 'true';
 };
 
+/**
+ * Check if the value can be converted to number
+ * @param {Any} value value to be checked
+ */
+const canBeConvertedToNumber = (value) => !isNaN(Number(value)) && value !== '';
+
 /**
  * Changes the value type
  * @param {FieldDataTypes} dataType type for value conversion
  * @param {Any} value value to be converted
  */
-const convertType = (dataType, value) =>
-  ({
-    [dataTypes.INTEGER]: !isNaN(Number(value)) && parseInt(value),
-    [dataTypes.FLOAT]: !isNaN(Number(value)) && parseFloat(value),
-    [dataTypes.NUMBER]: Number(value),
-    [dataTypes.BOOLEAN]: castToBoolean(value)
-  }[dataType] || value);
+const convertType = (dataType, value) => {
+  switch (dataType) {
+    case dataTypes.INTEGER:
+      return canBeConvertedToNumber(value) ? parseInt(value) : value;
+    case dataTypes.FLOAT:
+      return canBeConvertedToNumber(value) ? parseFloat(value) : value;
+    case dataTypes.NUMBER:
+      return canBeConvertedToNumber(value) ? Number(value) : value;
+    case dataTypes.BOOLEAN:
+      return castToBoolean(value);
+    default:
+      return value;
+  }
+};
 
 export default convertType;