@dhis2/ui-forms 7.11.1 → 7.12.0

package/build/cjs/locales/en/translations.json

@@ -1,31 +1,31 @@
 {
-    "Upload file": "",
-    "Upload files": "",
-    "Remove": "",
-    "No file(s) selected yet": "",
-    "Please provide an alpha-numeric value": "",
-    "Please provide a boolean value": "",
-    "Please enter between {{lowerBound}} and {{upperBound}} characters": "",
-    "Please make sure the value of this input matches the value in \"{{otherField}}\".": "",
-    "Please enter a maximum of {{upperBound}} characters": "",
-    "Please enter a number with a maximum of {{upperBound}}": "",
-    "Please enter at least {{lowerBound}} characters": "",
-    "Please enter a number of at least {{lowerBound}}": "",
-    "Number cannot be less than {{lowerBound}} or more than {{upperBound}}": "",
-    "Please make sure the value of this input matches the pattern {{patternString}}.": "",
-    "Password should be a string": "",
-    "Password should be at least 8 characters long": "",
-    "Password should be no longer than 34 characters": "",
-    "Password should contain at least one lowercase letter": "",
-    "Password should contain at least one UPPERCASE letter": "",
-    "Password should contain at least one number": "",
-    "Password should have at least one special character": "",
-    "Please provide a username between 1 and 255 characters": "",
-    "Please provide a valid email address": "",
-    "Please provide a value": "",
-    "Please provide a round number without decimals": "",
-    "Please provide a valid international phone number.": "",
-    "Please provide a number": "",
-    "Please provide a string": "",
-    "Please provide a valid url": ""
+    "Upload file": "Upload file",
+    "Upload files": "Upload files",
+    "Remove": "Remove",
+    "No file(s) selected yet": "No file(s) selected yet",
+    "Please provide an alpha-numeric value": "Please provide an alpha-numeric value",
+    "Please provide a boolean value": "Please provide a boolean value",
+    "Please enter between {{lowerBound}} and {{upperBound}} characters": "Please enter between {{lowerBound}} and {{upperBound}} characters",
+    "Please make sure the value of this input matches the value in \"{{otherField}}\".": "Please make sure the value of this input matches the value in \"{{otherField}}\".",
+    "Please enter a maximum of {{upperBound}} characters": "Please enter a maximum of {{upperBound}} characters",
+    "Please enter a number with a maximum of {{upperBound}}": "Please enter a number with a maximum of {{upperBound}}",
+    "Please enter at least {{lowerBound}} characters": "Please enter at least {{lowerBound}} characters",
+    "Please enter a number of at least {{lowerBound}}": "Please enter a number of at least {{lowerBound}}",
+    "Number cannot be less than {{lowerBound}} or more than {{upperBound}}": "Number cannot be less than {{lowerBound}} or more than {{upperBound}}",
+    "Please make sure the value of this input matches the pattern {{patternString}}.": "Please make sure the value of this input matches the pattern {{patternString}}.",
+    "Password should be a string": "Password should be a string",
+    "Password should be at least 8 characters long": "Password should be at least 8 characters long",
+    "Password should be no longer than 34 characters": "Password should be no longer than 34 characters",
+    "Password should contain at least one lowercase letter": "Password should contain at least one lowercase letter",
+    "Password should contain at least one UPPERCASE letter": "Password should contain at least one UPPERCASE letter",
+    "Password should contain at least one number": "Password should contain at least one number",
+    "Password should have at least one special character": "Password should have at least one special character",
+    "Please provide a username between 4 and 255 characters": "Please provide a username between 4 and 255 characters",
+    "Please provide a valid email address": "Please provide a valid email address",
+    "Please provide a value": "Please provide a value",
+    "Please provide a round number without decimals": "Please provide a round number without decimals",
+    "Please provide a valid international phone number.": "Please provide a valid international phone number.",
+    "Please provide a number": "Please provide a number",
+    "Please provide a string": "Please provide a string",
+    "Please provide a valid url": "Please provide a valid url"
 }

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

@@ -6,16 +6,24 @@ var _index = require("../test-helpers/index.js");
 
 describe('validator: dhis2Username', () => {
   (0, _index.allowsEmptyValues)(_dhis2Username.dhis2Username);
-  describe('allows all sorts of strings between 1 and 255 characters long', () => {
-    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, undefined, ['electricchicken', '1', //1
-    'sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss', //255
-    'some_username^%&*(', 'あいうえお']);
+  describe('constrains length of username to between 4 and 255 characters long', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, undefined, ['s'.repeat(4), 's'.repeat(255), 'valid_username']);
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['1', 's', 's'.repeat(256)]);
   });
-  describe('rejects other data types', () => {
-    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, [1, true, {}, [], () => {}]);
+  describe('does not allow usernames to start with _, . or @', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['_xxx', '.xxx', '@xxx']);
+  });
+  describe('does not allow usernames to end with _, . or @', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['xxx_', 'xxx.', 'xxx@']);
+  });
+  describe('does not allow usernames to contain __, .. or @@', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['__xx', '..xx', '@@xx']);
   });
-  describe('values that are too long', () => {
-    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss' //256
-    ]);
+  describe('constrains characters in usernames to [a-z0-9._@]', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, undefined, ['v@lid_user.name', '123another_v@lid_usern@me']);
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['あいうえお', 'some_username^%&*(']);
+  });
+  describe('rejects non-string data types', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, [1, true, {}, [], () => {}]);
   });
 });

package/build/cjs/validators/dhis2Username.js

@@ -11,10 +11,12 @@ var _index2 = require("./helpers/index.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const invalidUsernameMessage = _index.default.t('Please provide a username between 1 and 255 characters');
+const USERNAME_PATTERN = /^(?=.{4,255}$)(?![_.@])(?!.*[_.@]{2})[a-z0-9._@]+(?<![_.@])$/;
+
+const invalidUsernameMessage = _index.default.t('Please provide a username between 4 and 255 characters');
 
 exports.invalidUsernameMessage = invalidUsernameMessage;
 
-const dhis2Username = value => (0, _index2.isEmpty)(value) || (0, _index2.isString)(value) && value.length >= 1 && value.length <= 255 ? undefined : invalidUsernameMessage;
+const dhis2Username = value => (0, _index2.isEmpty)(value) || (0, _index2.isString)(value) && USERNAME_PATTERN.test(value) ? undefined : invalidUsernameMessage;
 
 exports.dhis2Username = dhis2Username;

package/build/es/locales/en/translations.json

@@ -1,31 +1,31 @@
 {
-    "Upload file": "",
-    "Upload files": "",
-    "Remove": "",
-    "No file(s) selected yet": "",
-    "Please provide an alpha-numeric value": "",
-    "Please provide a boolean value": "",
-    "Please enter between {{lowerBound}} and {{upperBound}} characters": "",
-    "Please make sure the value of this input matches the value in \"{{otherField}}\".": "",
-    "Please enter a maximum of {{upperBound}} characters": "",
-    "Please enter a number with a maximum of {{upperBound}}": "",
-    "Please enter at least {{lowerBound}} characters": "",
-    "Please enter a number of at least {{lowerBound}}": "",
-    "Number cannot be less than {{lowerBound}} or more than {{upperBound}}": "",
-    "Please make sure the value of this input matches the pattern {{patternString}}.": "",
-    "Password should be a string": "",
-    "Password should be at least 8 characters long": "",
-    "Password should be no longer than 34 characters": "",
-    "Password should contain at least one lowercase letter": "",
-    "Password should contain at least one UPPERCASE letter": "",
-    "Password should contain at least one number": "",
-    "Password should have at least one special character": "",
-    "Please provide a username between 1 and 255 characters": "",
-    "Please provide a valid email address": "",
-    "Please provide a value": "",
-    "Please provide a round number without decimals": "",
-    "Please provide a valid international phone number.": "",
-    "Please provide a number": "",
-    "Please provide a string": "",
-    "Please provide a valid url": ""
+    "Upload file": "Upload file",
+    "Upload files": "Upload files",
+    "Remove": "Remove",
+    "No file(s) selected yet": "No file(s) selected yet",
+    "Please provide an alpha-numeric value": "Please provide an alpha-numeric value",
+    "Please provide a boolean value": "Please provide a boolean value",
+    "Please enter between {{lowerBound}} and {{upperBound}} characters": "Please enter between {{lowerBound}} and {{upperBound}} characters",
+    "Please make sure the value of this input matches the value in \"{{otherField}}\".": "Please make sure the value of this input matches the value in \"{{otherField}}\".",
+    "Please enter a maximum of {{upperBound}} characters": "Please enter a maximum of {{upperBound}} characters",
+    "Please enter a number with a maximum of {{upperBound}}": "Please enter a number with a maximum of {{upperBound}}",
+    "Please enter at least {{lowerBound}} characters": "Please enter at least {{lowerBound}} characters",
+    "Please enter a number of at least {{lowerBound}}": "Please enter a number of at least {{lowerBound}}",
+    "Number cannot be less than {{lowerBound}} or more than {{upperBound}}": "Number cannot be less than {{lowerBound}} or more than {{upperBound}}",
+    "Please make sure the value of this input matches the pattern {{patternString}}.": "Please make sure the value of this input matches the pattern {{patternString}}.",
+    "Password should be a string": "Password should be a string",
+    "Password should be at least 8 characters long": "Password should be at least 8 characters long",
+    "Password should be no longer than 34 characters": "Password should be no longer than 34 characters",
+    "Password should contain at least one lowercase letter": "Password should contain at least one lowercase letter",
+    "Password should contain at least one UPPERCASE letter": "Password should contain at least one UPPERCASE letter",
+    "Password should contain at least one number": "Password should contain at least one number",
+    "Password should have at least one special character": "Password should have at least one special character",
+    "Please provide a username between 4 and 255 characters": "Please provide a username between 4 and 255 characters",
+    "Please provide a valid email address": "Please provide a valid email address",
+    "Please provide a value": "Please provide a value",
+    "Please provide a round number without decimals": "Please provide a round number without decimals",
+    "Please provide a valid international phone number.": "Please provide a valid international phone number.",
+    "Please provide a number": "Please provide a number",
+    "Please provide a string": "Please provide a string",
+    "Please provide a valid url": "Please provide a valid url"
 }

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

@@ -2,16 +2,24 @@ import { dhis2Username, invalidUsernameMessage } from '../dhis2Username.js';
 import { testValidatorValues, allowsEmptyValues } from '../test-helpers/index.js';
 describe('validator: dhis2Username', () => {
   allowsEmptyValues(dhis2Username);
-  describe('allows all sorts of strings between 1 and 255 characters long', () => {
-    testValidatorValues(dhis2Username, undefined, ['electricchicken', '1', //1
-    'sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss', //255
-    'some_username^%&*(', 'あいうえお']);
+  describe('constrains length of username to between 4 and 255 characters long', () => {
+    testValidatorValues(dhis2Username, undefined, ['s'.repeat(4), 's'.repeat(255), 'valid_username']);
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['1', 's', 's'.repeat(256)]);
   });
-  describe('rejects other data types', () => {
-    testValidatorValues(dhis2Username, invalidUsernameMessage, [1, true, {}, [], () => {}]);
+  describe('does not allow usernames to start with _, . or @', () => {
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['_xxx', '.xxx', '@xxx']);
+  });
+  describe('does not allow usernames to end with _, . or @', () => {
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['xxx_', 'xxx.', 'xxx@']);
+  });
+  describe('does not allow usernames to contain __, .. or @@', () => {
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['__xx', '..xx', '@@xx']);
   });
-  describe('values that are too long', () => {
-    testValidatorValues(dhis2Username, invalidUsernameMessage, ['ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss' //256
-    ]);
+  describe('constrains characters in usernames to [a-z0-9._@]', () => {
+    testValidatorValues(dhis2Username, undefined, ['v@lid_user.name', '123another_v@lid_usern@me']);
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['あいうえお', 'some_username^%&*(']);
+  });
+  describe('rejects non-string data types', () => {
+    testValidatorValues(dhis2Username, invalidUsernameMessage, [1, true, {}, [], () => {}]);
   });
 });

package/build/es/validators/dhis2Username.js

@@ -1,7 +1,8 @@
 import i18n from '../locales/index.js';
 import { isEmpty, isString } from './helpers/index.js';
-const invalidUsernameMessage = i18n.t('Please provide a username between 1 and 255 characters');
+const USERNAME_PATTERN = /^(?=.{4,255}$)(?![_.@])(?!.*[_.@]{2})[a-z0-9._@]+(?<![_.@])$/;
+const invalidUsernameMessage = i18n.t('Please provide a username between 4 and 255 characters');
 
-const dhis2Username = value => isEmpty(value) || isString(value) && value.length >= 1 && value.length <= 255 ? undefined : invalidUsernameMessage;
+const dhis2Username = value => isEmpty(value) || isString(value) && USERNAME_PATTERN.test(value) ? undefined : invalidUsernameMessage;
 
 export { dhis2Username, invalidUsernameMessage };

package/package.json

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