FIO-8037: moved validateNumberInfo to clientRules and resolved conflicts

src/process/validation/rules/clientRules.ts

@@ -23,6 +23,7 @@ import { validateRequiredDayInfo } from "./validateRequiredDay";
 import { validateTimeInfo } from "./validateTime";
 import { validateUrlInfo } from "./validateUrl";
 import { validateValuePropertyInfo } from "./validateValueProperty";
+import { validateNumberInfo } from "./validateNumber";
 
 // These are the validations that are performed in the client.
 export const clientRules: ValidationRuleInfo[] = [
@@ -49,5 +50,6 @@ export const clientRules: ValidationRuleInfo[] = [
     validateRequiredDayInfo,
     validateTimeInfo,
     validateUrlInfo,
-    validateValuePropertyInfo
+    validateValuePropertyInfo,
+    validateNumberInfo
 ];

src/process/validation/rules/databaseRules.ts

@@ -1,11 +1,9 @@
 import { ValidationRuleInfo } from "types";
 import { validateUniqueInfo } from "./validateUnique";
 import { validateCaptchaInfo } from "./validateCaptcha";
-import { validateNumberInfo } from "./validateNumber";
 
 // These are the validations that require a database connection.
 export const databaseRules: ValidationRuleInfo[] = [
     validateUniqueInfo,
-    validateCaptchaInfo,
-    validateNumberInfo
+    validateCaptchaInfo
 ];

src/process/validation/rules/validateNumber.ts

@@ -24,10 +24,7 @@ export const validateNumber: RuleFn = async (context: ValidationContext) => {
 export const validateNumberSync: RuleFnSync = (context: ValidationContext) => {
     const error = new FieldError('number', context);
     const { value } = context;
-    if (!shouldValidate(context)) {
-        return null;
-    }
-
+
     if (typeof value !== 'number')  {
         return error;
     }