Improve int validator readability

elastic · Oct 24, 2024 · 8c156ce · 8c156ce
1 parent b30cb83
commit 8c156ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_integer.test.ts b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_integer.test.ts
@@ -36,4 +36,12 @@ describe('isInteger', () => {
   test('should return Validation function if value a string that can not be parsed to number', () => {
     expect(validator('test')).toMatchObject({ message, code });
   });
+
+  test('should return Validation function if value is boolean', () => {
+    expect(validator(false)).toMatchObject({ message, code });
+  });
+
+  test('should return undefined if value is empty', () => {
+    expect(validator('')).toBeUndefined();
+  });
 });
diff --git a/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_integer.ts b/src/plugins/es_ui_shared/static/forms/helpers/field_validators/is_integer.ts
@@ -15,11 +15,13 @@ export const isInteger =
   (...args: Parameters<ValidationFunc>): ReturnType<ValidationFunc<any, ERROR_CODE>> => {
     const [{ value }] = args;
 
-    if (value === '') {
-      return;
+    if (
+      value === '' ||
+      (typeof value === 'number' && Number.isInteger(value)) ||
+      (typeof value === 'string' && Number.isInteger(Number(value)))
+    ) {
+      return undefined;
     }
 
-    const numValue = typeof value === 'string' ? Number(value) : value;
-
-    return Number.isInteger(numValue) ? undefined : { message, code: 'ERR_NOT_INT_NUMBER' };
+    return { message, code: 'ERR_NOT_INT_NUMBER' };
   };