@dhis2/ui-forms 8.4.16 → 8.4.17

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

@@ -26,5 +26,5 @@
     "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",
-    "Please provide a username between 4 and 255 characters long and possibly separated by . _ @ or #": "Please provide a username between 4 and 255 characters long and possibly separated by . _ @ or #"
+    "Please provide a username between 4 and 255 characters long and possibly separated by . _ - or @": "Please provide a username between 4 and 255 characters long and possibly separated by . _ - or @"
 }

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

@@ -10,17 +10,17 @@ describe('validator: dhis2Username', () => {
     (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('does not allow usernames to start with _, . or @', () => {
-    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['_xxx', '.xxx', '@xxx']);
+  describe('does not allow usernames to start with _, -, . or @', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['_xxx', '-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 end with _, -, . or @', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['xxx_', 'xxx-', 'xxx.', 'xxx@']);
   });
-  describe('does not allow usernames to contain __, .. or @@', () => {
-    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['__xx', '..xx', '@@xx']);
+  describe('does not allow usernames to contain __, --, .. or @@', () => {
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['xx__xx', 'xx--xx', 'xx..xx', 'xx@@xx']);
   });
   describe('constrains characters in usernames to [a-z0-9._@]', () => {
-    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, undefined, ['v@lid_user.name', '123another_v@lid_usern@me', 'UPPER_CASE', 'lower@ca.se']);
+    (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, undefined, ['v@lid_user.name', 'v@lid-user.name', '123another_v@lid_usern@me', 'UPPER_CASE', 'lower@ca.se']);
     (0, _index.testValidatorValues)(_dhis2Username.dhis2Username, _dhis2Username.invalidUsernameMessage, ['あいうえお', 'some_username^%&*(']);
   });
   describe('rejects non-string data types', () => {

package/build/cjs/validators/dhis2Username.js

@@ -11,9 +11,9 @@ var _index2 = require("./helpers/index.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const USERNAME_PATTERN = /^(?=.{4,255}$)(?![_.@])(?!.*[_.@]{2})[a-zA-Z0-9._@]+(?<![_.@])$/;
+const USERNAME_PATTERN = /^(?=.{4,255}$)(?![_\-.@])(?!.*[_\-.@]{2})[a-zA-Z0-9._\-@]+(?<![_\-.@])$/;
 
-const invalidUsernameMessage = _index.default.t('Please provide a username between 4 and 255 characters long and possibly separated by . _ @ or #');
+const invalidUsernameMessage = _index.default.t('Please provide a username between 4 and 255 characters long and possibly separated by . _ - or @');
 
 exports.invalidUsernameMessage = invalidUsernameMessage;
 

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

@@ -26,5 +26,5 @@
     "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",
-    "Please provide a username between 4 and 255 characters long and possibly separated by . _ @ or #": "Please provide a username between 4 and 255 characters long and possibly separated by . _ @ or #"
+    "Please provide a username between 4 and 255 characters long and possibly separated by . _ - or @": "Please provide a username between 4 and 255 characters long and possibly separated by . _ - or @"
 }

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

@@ -6,17 +6,17 @@ describe('validator: dhis2Username', () => {
     testValidatorValues(dhis2Username, undefined, ['s'.repeat(4), 's'.repeat(255), 'valid_username']);
     testValidatorValues(dhis2Username, invalidUsernameMessage, ['1', 's', 's'.repeat(256)]);
   });
-  describe('does not allow usernames to start with _, . or @', () => {
-    testValidatorValues(dhis2Username, invalidUsernameMessage, ['_xxx', '.xxx', '@xxx']);
+  describe('does not allow usernames to start with _, -, . or @', () => {
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['_xxx', '-xxx', '.xxx', '@xxx']);
   });
-  describe('does not allow usernames to end with _, . or @', () => {
-    testValidatorValues(dhis2Username, invalidUsernameMessage, ['xxx_', 'xxx.', 'xxx@']);
+  describe('does not allow usernames to end with _, -, . or @', () => {
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['xxx_', 'xxx-', 'xxx.', 'xxx@']);
   });
-  describe('does not allow usernames to contain __, .. or @@', () => {
-    testValidatorValues(dhis2Username, invalidUsernameMessage, ['__xx', '..xx', '@@xx']);
+  describe('does not allow usernames to contain __, --, .. or @@', () => {
+    testValidatorValues(dhis2Username, invalidUsernameMessage, ['xx__xx', 'xx--xx', 'xx..xx', 'xx@@xx']);
   });
   describe('constrains characters in usernames to [a-z0-9._@]', () => {
-    testValidatorValues(dhis2Username, undefined, ['v@lid_user.name', '123another_v@lid_usern@me', 'UPPER_CASE', 'lower@ca.se']);
+    testValidatorValues(dhis2Username, undefined, ['v@lid_user.name', 'v@lid-user.name', '123another_v@lid_usern@me', 'UPPER_CASE', 'lower@ca.se']);
     testValidatorValues(dhis2Username, invalidUsernameMessage, ['あいうえお', 'some_username^%&*(']);
   });
   describe('rejects non-string data types', () => {

package/build/es/validators/dhis2Username.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "8.4.16",
+    "version": "8.4.17",
     "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.16",
-        "@dhis2-ui/checkbox": "8.4.16",
-        "@dhis2-ui/field": "8.4.16",
-        "@dhis2-ui/file-input": "8.4.16",
-        "@dhis2-ui/input": "8.4.16",
-        "@dhis2-ui/radio": "8.4.16",
-        "@dhis2-ui/select": "8.4.16",
-        "@dhis2-ui/switch": "8.4.16",
-        "@dhis2-ui/text-area": "8.4.16",
+        "@dhis2-ui/button": "8.4.17",
+        "@dhis2-ui/checkbox": "8.4.17",
+        "@dhis2-ui/field": "8.4.17",
+        "@dhis2-ui/file-input": "8.4.17",
+        "@dhis2-ui/input": "8.4.17",
+        "@dhis2-ui/radio": "8.4.17",
+        "@dhis2-ui/select": "8.4.17",
+        "@dhis2-ui/switch": "8.4.17",
+        "@dhis2-ui/text-area": "8.4.17",
         "classnames": "^2.3.1",
         "final-form": "^4.20.2",
         "prop-types": "^15.7.2",