Merge pull request #554 from Opetushallitus/decimal-fix

Add maybeParseNumber to handle comma
Opetushallitus · Oct 17, 2023 · 3863fe6 · 3863fe6
2 parents d97ee92 + 917ed7a
commit 3863fe6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/app/src/utils/index.test.ts b/src/main/app/src/utils/index.test.ts
@@ -3,6 +3,7 @@ import {
   getValuesForSaving,
   isDeepEmptyFormValues,
   formatDateValue,
+  maybeParseNumber,
 } from '#/src/utils';
 
 const OBJECT_IN_ARRAY = [
@@ -60,6 +61,14 @@ test('Should return false for zero', () => {
   expect(isDeepEmptyFormValues(0)).toEqual(false);
 });
 
+test('parses decimal with comma', () => {
+  expect(maybeParseNumber('5,8')).toEqual(5.8);
+});
+
+test('does not convert text to number', () => {
+  expect(maybeParseNumber('a')).toEqual('a');
+});
+
 test.each([
   [
     {

diff --git a/src/main/app/src/utils/index.ts b/src/main/app/src/utils/index.ts
@@ -211,7 +211,10 @@ export const maybeParseNumber = value => {
   if (_.isNil(value) || value === '') {
     return null;
   }
-  const numberValue = Number(value);
+  const numberValue =
+    _.isString(value) && value.includes(',')
+      ? Number(value.replace(',', '.'))
+      : Number(value);
   return _.isNaN(numberValue) ? value : numberValue;
 };