@dhis2/ui-forms 8.4.4 → 8.4.7

package/build/cjs/validators/__tests__/integer.test.js

@@ -9,10 +9,10 @@ describe('validator: integer', () => {
   describe('allows integers and string representations of integers', () => {
     (0, _index.testValidatorValues)(_integer.integer, undefined, [-2, 0, 2, 10000, '-2', '0', '2', '10000', 12e4]);
   });
-  describe('rejects other data types', () => {
-    (0, _index.testValidatorValues)(_integer.integer, _integer.invalidIntegerMessage, ['text', true, {}, [], () => {}]);
+  describe('rejects other data types and leading zeros', () => {
+    (0, _index.testValidatorValues)(_integer.integer, _integer.invalidIntegerMessage, ['text', '014', true, {}, [], () => {}]);
   });
   describe('rejects floats and string representations of floats', () => {
-    (0, _index.testValidatorValues)(_integer.integer, _integer.invalidIntegerMessage, [0.23456, 5.987, 1e-12, '0.23456', '5.987', '1e-12']);
+    (0, _index.testValidatorValues)(_integer.integer, _integer.invalidIntegerMessage, [0.23456, 5.987, 1e-12, '4.0', '4.000', '4,0', '0.23456', '5.987', '1e-12']);
   });
 });

package/build/cjs/validators/helpers/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toNumber = exports.requiredArgumentErrorMessage = exports.requireArgument = exports.isString = exports.isNumeric = exports.isNumber = exports.isInteger = exports.isInRange = exports.isEmpty = void 0;
+exports.toNumber = exports.requiredArgumentErrorMessage = exports.requireArgument = exports.isString = exports.isNumeric = exports.isNumber = exports.isInRange = exports.isEmpty = void 0;
 
 const isEmpty = value => typeof value === 'undefined' || value === null || value === '';
 
@@ -13,10 +13,6 @@ const isString = value => typeof value === 'string';
 
 exports.isString = isString;
 
-const isInteger = value => Number.isSafeInteger(value);
-
-exports.isInteger = isInteger;
-
 const isNumber = value => typeof value === 'number';
 
 exports.isNumber = isNumber;

package/build/cjs/validators/integer.js

@@ -11,10 +11,13 @@ var _index2 = require("./helpers/index.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const invalidIntegerMessage = _index.default.t('Please provide a round number without decimals');
+const invalidIntegerMessage = _index.default.t('Please provide a round number without decimals'); // Regex accepts only digits (no decimals even if it is trailing like 4.0)
+// it also rejects a leading 0 (i.e 04) as this is rejected by backend
+
 
 exports.invalidIntegerMessage = invalidIntegerMessage;
+const INTEGER_PATTERN = /^(-?[1-9]\d*|0)$/;
 
-const integer = value => (0, _index2.isEmpty)(value) || (0, _index2.isNumeric)(value) && (0, _index2.isInteger)((0, _index2.toNumber)(value)) ? undefined : invalidIntegerMessage;
+const integer = value => (0, _index2.isEmpty)(value) || INTEGER_PATTERN.test(value) && (0, _index2.isNumeric)(value) && Number.isSafeInteger((0, _index2.toNumber)(value)) ? undefined : invalidIntegerMessage;
 
 exports.integer = integer;

package/build/es/validators/__tests__/integer.test.js

@@ -5,10 +5,10 @@ describe('validator: integer', () => {
   describe('allows integers and string representations of integers', () => {
     testValidatorValues(integer, undefined, [-2, 0, 2, 10000, '-2', '0', '2', '10000', 12e4]);
   });
-  describe('rejects other data types', () => {
-    testValidatorValues(integer, invalidIntegerMessage, ['text', true, {}, [], () => {}]);
+  describe('rejects other data types and leading zeros', () => {
+    testValidatorValues(integer, invalidIntegerMessage, ['text', '014', true, {}, [], () => {}]);
   });
   describe('rejects floats and string representations of floats', () => {
-    testValidatorValues(integer, invalidIntegerMessage, [0.23456, 5.987, 1e-12, '0.23456', '5.987', '1e-12']);
+    testValidatorValues(integer, invalidIntegerMessage, [0.23456, 5.987, 1e-12, '4.0', '4.000', '4,0', '0.23456', '5.987', '1e-12']);
   });
 });

package/build/es/validators/helpers/index.js

@@ -1,6 +1,5 @@
 export const isEmpty = value => typeof value === 'undefined' || value === null || value === '';
 export const isString = value => typeof value === 'string';
-export const isInteger = value => Number.isSafeInteger(value);
 export const isNumber = value => typeof value === 'number';
 export const isNumeric = value => (isString(value) || isNumber(value)) && !isNaN(value);
 export const isInRange = (lowerBound, upperBound, value) => value >= lowerBound && value <= upperBound;

package/build/es/validators/integer.js

@@ -1,7 +1,10 @@
 import i18n from '../locales/index.js';
-import { isEmpty, isInteger, isNumeric, toNumber } from './helpers/index.js';
-const invalidIntegerMessage = i18n.t('Please provide a round number without decimals');
+import { isEmpty, isNumeric, toNumber } from './helpers/index.js';
+const invalidIntegerMessage = i18n.t('Please provide a round number without decimals'); // Regex accepts only digits (no decimals even if it is trailing like 4.0)
+// it also rejects a leading 0 (i.e 04) as this is rejected by backend
 
-const integer = value => isEmpty(value) || isNumeric(value) && isInteger(toNumber(value)) ? undefined : invalidIntegerMessage;
+const INTEGER_PATTERN = /^(-?[1-9]\d*|0)$/;
+
+const integer = value => isEmpty(value) || INTEGER_PATTERN.test(value) && isNumeric(value) && Number.isSafeInteger(toNumber(value)) ? undefined : invalidIntegerMessage;
 
 export { integer, invalidIntegerMessage };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "8.4.4",
+    "version": "8.4.7",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "sideEffects": [
@@ -34,15 +34,15 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "8.4.4",
-        "@dhis2-ui/checkbox": "8.4.4",
-        "@dhis2-ui/field": "8.4.4",
-        "@dhis2-ui/file-input": "8.4.4",
-        "@dhis2-ui/input": "8.4.4",
-        "@dhis2-ui/radio": "8.4.4",
-        "@dhis2-ui/select": "8.4.4",
-        "@dhis2-ui/switch": "8.4.4",
-        "@dhis2-ui/text-area": "8.4.4",
+        "@dhis2-ui/button": "8.4.7",
+        "@dhis2-ui/checkbox": "8.4.7",
+        "@dhis2-ui/field": "8.4.7",
+        "@dhis2-ui/file-input": "8.4.7",
+        "@dhis2-ui/input": "8.4.7",
+        "@dhis2-ui/radio": "8.4.7",
+        "@dhis2-ui/select": "8.4.7",
+        "@dhis2-ui/switch": "8.4.7",
+        "@dhis2-ui/text-area": "8.4.7",
         "classnames": "^2.3.1",
         "final-form": "^4.20.2",
         "prop-types": "^15.7.2",