:start: new: add validator for array

Author: icebob

dev/app.vue

@@ -229,4 +229,12 @@
 		}
 	}
 
+	.errors {
+		.alert {
+			padding: 4px;
+			width: 80%;
+			margin: 5px auto;
+		}
+	}
+
 </style>

dev/schema.js

@@ -78,7 +78,10 @@ module.exports = {
 				"AngularJS",
 				"ReactJS",
 				"VueJS"
-			]
+			],
+			min: 2,
+			max: 4,
+			validator: validators.array
 		},	
 		{
 			type: "text",
@@ -263,14 +266,12 @@ module.exports = {
 			label: "City",
 			model: "address.city",
 			multi: true,
-			required: true,
 			validator: validators.required
 		},
 		{
 			type: "text",
 			label: "Street",
-			model: "address.streetC",
-			required: true
+			model: "address.streetC"
 		},        
 		{
 			type: "text",

src/fields/abstractField.js

@@ -54,7 +54,7 @@ export default {
 		validate() {
 			this.clearValidationErrors();
 
-			if (this.schema.validator) {
+			if (this.schema.validator && this.schema.readonly !== true && this.disabled !== true) {
 
 				let validators = [];
 				if (!isArray(this.schema.validator)) {

src/utils/validators.js

@@ -1,4 +1,4 @@
-import { isNil, isNumber, isString } from "lodash";
+import { isNil, isNumber, isString, isArray } from "lodash";
 import moment from "moment";
 
 function checkEmpty(value, required) {
@@ -61,6 +61,27 @@ module.exports = {
 		return err;
 	},
 
+	array(value, field) {
+		if (field.required) {
+
+			if (!isArray(value))
+				return ["Value is not an array!"];
+
+			if (value.length == 0)
+				return ["This field is required!"];
+		}
+
+		if (!isNil(value)) {
+			if (!isNil(field.min))
+				if (value.length < field.min)
+					return ["Select minimum " + field.min + " items!"];
+
+			if (!isNil(field.max))
+				if (value.length > field.max)
+					return ["Select maximum " + field.max + " items!"];
+		}
+	},	
+
 	date(value, field) {
 		let res = checkEmpty(value, field.required); if (res != null) return res;
 

test/unit/specs/fields/abstractField.spec.js

@@ -197,6 +197,51 @@ describe("abstractField.vue", () => {
 
 	});	
 
+	describe("check validate function if field is disabled", () => {
+		let schema = {
+			type: "text",		
+			label: "Name", 
+			model: "name", 
+			validator: sinon.spy()
+		};
+
+		let model = { name: "John Doe" };
+
+		beforeEach( () => {
+			createField(schema, model, true);
+		});
+
+		it("should not call schema validator", () => {
+			schema.validator.reset();
+			field.validate();
+			expect(schema.validator.callCount).to.be.equal(0);
+		});
+
+	});	
+
+	describe("check validate function if field is readonly", () => {
+		let schema = {
+			type: "text",		
+			label: "Name", 
+			model: "name", 
+			readonly: true,
+			validator: sinon.spy()
+		};
+
+		let model = { name: "John Doe" };
+
+		beforeEach( () => {
+			createField(schema, model);
+		});
+
+		it("should not call schema validator", () => {
+			schema.validator.reset();
+			field.validate();
+			expect(schema.validator.callCount).to.be.equal(0);
+		});
+
+	});		
+
 	describe("check validate function with validator array", () => {
 		let spy1 = sinon.spy();
 		let spy2 = sinon.spy();

test/unit/specs/utils/validators.spec.js

@@ -129,6 +129,54 @@ describe("Validators", () => {
 		});
 	});
 
+	describe.only("test Validators.array", () => {
+
+		let field = {
+			required: true,
+			min: 2,
+			max: 4
+		}
+
+		it("should give error if value is null, but field is required", () => {
+			check(v.array, null, field, 1);
+		});
+
+		it("should give error if count of items is smaller than min", () => {
+			check(v.array, [], field, 1);
+			check(v.array, [1], field, 1);
+			check(v.array, ["ab"], field, 1);
+			check(v.array, [true], field, 1);
+		});
+		
+		it("should give error if count of items is greater than max", () => {
+			check(v.array, [1,2,3,4,5], field, 1);
+		});
+
+		it("should give error if value is not array", () => {
+			check(v.array, 123, field, 1);
+			check(v.array, true, field, 1);
+			check(v.array, "John", field, 1);
+		});
+		
+		it("should not give error", () => {
+			check(v.array, [1,4], field, 0);
+			check(v.array, ["John", "Doe", "Jane"], field, 0);
+			check(v.array, [true, true, false], field, 0);
+			check(v.array, [ [5], [3] ], field, 0);
+		});
+
+		it("should not give error if value is null and field is not required", () => {
+			field.required = false;
+			check(v.array, null, field, 0);
+		});
+
+		it("should give error if count of item is smaller than minimum and field is not required", () => {
+			field.required = false;
+			check(v.array, ["Foo"], field, 1);
+		});
+
+	});	
+
 	describe("test Validators.date", () => {
 
 		let field = {