Merge pull request #255 from rvsia/fixUrlMessage

fix(renderer): allow URL validator to pass custom messages

Author: Hyperkid123

packages/react-form-renderer/src/tests/validators/validators.test.js

@@ -266,6 +266,12 @@ describe('New validators', () => {
       expect(validatorMapper(validators.URL)({})('https://www.')).toBe(failMessage);
     });
 
+    it('should return custom message', () => {
+      const customMessage = 'customMessage';
+
+      expect(validatorMapper(validators.URL)({ message: customMessage })('https://www.')).toBe(customMessage);
+    });
+
     it('should validate only URL with ftp protocol', () => {
       expect(validatorMapper(validators.URL)({ protocol: 'ftp' })('https://www.google.com/')).toBe(failMessage);
       expect(validatorMapper(validators.URL)({ protocol: 'ftp' })('ftp://www.google.com/')).toBeUndefined();

packages/react-form-renderer/src/validators/validator-mapper.js

@@ -35,5 +35,5 @@ export default validatorType => ({
     numericality({ [includeThreshold ? '<=' : '<']: value, ...rest }),
   [validators.MIN_NUMBER_VALUE]: ({ value, includeThreshold = true, ...rest }) =>
     numericality({ [includeThreshold ? '>=' : '>']: value, ...rest }),
-  [validators.URL]: options =>  pattern({ pattern: url(options), message: 'String is not URL.' }),
+  [validators.URL]: ({ message, ...options }) =>  pattern({ pattern: url(options), message: message || 'String is not URL.' }),
 })[validatorType];