From fa2ef05ef12f46b84b96bb2da97203e700e889fc Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 11 Jan 2017 23:31:03 +1300
Subject: [PATCH] Throw warning on missing client validation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Client-side validation is not essential (we can only rely on server-side validation being enforced).
So it doesn’t make sense to throw an exception in this context, and stop the entire CMS execution because of missing rules.
---
 admin/client/dist/js/bundle.js               |  3 ++-
 admin/client/src/lib/Validator.js            |  4 +++-
 admin/client/src/lib/tests/Validator-test.js | 11 +++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
index 86d763d43..211c3e6f3 100644
--- a/admin/client/dist/js/bundle.js
+++ b/admin/client/dist/js/bundle.js
@@ -424,7 +424,8 @@ case"alphanumeric":return u["default"].isAlphanumeric(e)
 case"alpha":return u["default"].isAlpha(e)
 case"regex":return u["default"].matches(e,n.pattern)
 case"max":return e.length<=n.length
-default:throw new Error("Unknown validation rule used: '"+t+"'")}}},{key:"validateFieldSchema",value:function l(e){return this.validateField(e.name,e.validation,null!==e.leftTitle?e.leftTitle:e.title,e.customValidationMessage)
+case"email":return u["default"].isEmail(e)
+default:console.warn("Unknown validation rule used: '"+t+"'")}}},{key:"validateFieldSchema",value:function l(e){return this.validateField(e.name,e.validation,null!==e.leftTitle?e.leftTitle:e.title,e.customValidationMessage)
 
 }},{key:"getMessage",value:function d(e,t){var n=""
 if("string"==typeof t.message)n=t.message
diff --git a/admin/client/src/lib/Validator.js b/admin/client/src/lib/Validator.js
index 45f7aa97f..2cf1cf3b6 100644
--- a/admin/client/src/lib/Validator.js
+++ b/admin/client/src/lib/Validator.js
@@ -60,7 +60,9 @@ class Validator {
         return validator.isEmail(value);
       }
       default: {
-        throw new Error(`Unknown validation rule used: '${rule}'`);
+        // eslint-disable-next-line no-console
+        console.warn(`Unknown validation rule used: '${rule}'`);
+        return false;
       }
     }
   }
diff --git a/admin/client/src/lib/tests/Validator-test.js b/admin/client/src/lib/tests/Validator-test.js
index 559b991ba..8b4b12e07 100644
--- a/admin/client/src/lib/tests/Validator-test.js
+++ b/admin/client/src/lib/tests/Validator-test.js
@@ -1,4 +1,7 @@
-/* global jest, describe, beforeEach, it, expect */
+/* global jest, describe, beforeEach, it, expect, console */
+
+// Needs to be set before requiring other libraries
+global.console = { warn: jest.fn() };
 
 jest.unmock('react');
 jest.unmock('react-addons-test-utils');
@@ -56,9 +59,9 @@ describe('Validator', () => {
   describe('validateValue()', () => {
     it('should throw an error', () => {
       validator = new Validator({});
-      const callRuleDoesNotExist = () => validator.validateValue('one', 'ruledoesnotexist');
-
-      expect(callRuleDoesNotExist).toThrowError(/unknown/i);
+      validator.validateValue('one', 'ruledoesnotexist');
+      // eslint-disable-next-line no-console
+      expect(console.warn).toBeCalled();
     });
   });