Improve Codacy score

Author: Lionel Bijaoui

dev/projects/full/app.vue

@@ -84,7 +84,9 @@ export default {
 
 	computed: {
 		validationErrors() {
-			if (this.$refs.form && this.$refs.form.errors) return this.$refs.form.errors;
+			if (this.$refs.form && this.$refs.form.errors) {
+				return this.$refs.form.errors;
+			}
 
 			return [];
 		}
@@ -187,7 +189,9 @@ export default {
 			let id = 0;
 
 			each(this.rows, (row) => {
-				if (row.id > id) id = row.id;
+				if (row.id > id) {
+					id = row.id;
+				}
 			});
 
 			return ++id;
@@ -206,8 +210,12 @@ export default {
 		getLocation(model) {
 			if (navigator.geolocation) {
 				navigator.geolocation.getCurrentPosition((pos) => {
-					if (!model.address) model.address = {};
-					if (!model.address.geo) model.address.geo = {};
+					if (!model.address) {
+						model.address = {};
+					}
+					if (!model.address.geo) {
+						model.address.geo = {};
+					}
 					model.address.geo.latitude = pos.coords.latitude.toFixed(5);
 					model.address.geo.longitude = pos.coords.longitude.toFixed(5);
 				});

dev/projects/full/data.js

@@ -3,7 +3,12 @@ import fecha from "fecha";
 
 let fakerator = new Fakerator();
 
-let roles = [{ id: "admin", name: "Administrator" }, { id: "moderator", name: "Moderator" }, { id: "user", name: "Registered User" }, { id: "visitor", name: "Visitor" }];
+let roles = [
+	{ id: "admin", name: "Administrator" },
+	{ id: "moderator", name: "Moderator" },
+	{ id: "user", name: "Registered User" },
+	{ id: "visitor", name: "Visitor" }
+];
 
 let skills = ["HTML5", "Javascript", "CSS3", "CoffeeScript", "AngularJS", "ReactJS", "VueJS"];
 
@@ -34,7 +39,9 @@ let users = (function() {
 		user.favoriteColor = "#" + fakerator.internet.color();
 		user.color = "#" + fakerator.internet.color();
 
-		if (user.type === "business") user.company = fakerator.entity.company();
+		if (user.type === "business") {
+			user.company = fakerator.entity.company();
+		}
 
 		user.income = [fakerator.random.number(50000), fakerator.random.number(50000, 100000)];
 

dev/projects/full/schema.js

@@ -51,7 +51,9 @@ export default {
 				console.log(`Model's name changed from ${oldVal} to ${newVal}. Model:`, model);
 			},
 			onValidated(model, errors) {
-				if (errors.length > 0) console.warn("Validation error in Name field! Errors:", errors);
+				if (errors.length > 0) {
+					console.warn("Validation error in Name field! Errors:", errors);
+				}
 			}
 		},
 		{
@@ -434,25 +436,29 @@ export default {
 				let values = val.split(",");
 				if (!model.address) model.address = {};
 				if (!model.address.geo) model.address.geo = {};
-				if (values.length > 0 && values[0].trim() !== "")
+				if (values.length > 0 && values[0].trim() !== "") {
 					model.address.geo.latitude = parseFloat(values[0].trim());
-				else model.address.geo.latitude = 0;
-				if (values.length > 1 && values[1].trim() !== "")
+				} else {
+					model.address.geo.latitude = 0;
+				}
+				if (values.length > 1 && values[1].trim() !== "") {
 					model.address.geo.longitude = parseFloat(values[1].trim());
-				else model.address.geo.longitude = 0;
+				} else {
+					model.address.geo.longitude = 0;
+				}
 			},
 			buttons: [
 				{
 					classes: "btn-location",
 					label: "Current location",
-					onclick: function(model) {
+					onclick(model) {
 						return this.$parent.getLocation(model);
 					}
 				},
 				{
 					classes: "btn-clear",
 					label: "Clear",
-					onclick: function(model) {
+					onclick(model) {
 						model.address.geo = {
 							latitude: 0,
 							longitude: 0

src/formElement.vue

@@ -65,24 +65,15 @@ export default {
 		},
 		// Should field type have a label?
 		fieldTypeHasLabel() {
-			if (isNil(this.field.label)) return false;
-
-			let relevantType = "";
-			let fieldOptions = this.getValueFromOption(this.field, "fieldOptions");
-			if (this.field.type === "input" && !isNil(fieldOptions)) {
-				relevantType = fieldOptions.inputType;
-			} else {
-				relevantType = this.field.type;
+			if (isNil(this.field.label)) {
+				return false;
 			}
+			let fieldOptions = this.getValueFromOption(this.field, "fieldOptions");
+			let condition = this.field.type === "input" && !isNil(fieldOptions);
+			let relevantType = condition ? fieldOptions.inputType : this.field.type;
+			const typeWithoutLabel = ["button", "submit", "reset"];
 
-			switch (relevantType) {
-				case "button":
-				case "submit":
-				case "reset":
-					return false;
-				default:
-					return true;
-			}
+			return !typeWithoutLabel.includes(relevantType);
 		},
 		fieldHasHint() {
 			return !isNil(this.field.hint);

src/formGenerator.vue

@@ -78,7 +78,7 @@ export default {
 		tag: {
 			type: String,
 			default: "fieldset",
-			validator: function(value) {
+			validator(value) {
 				return value.length > 0;
 			}
 		}
@@ -87,7 +87,7 @@ export default {
 	data() {
 		const eventBus = new Vue();
 		return {
-			eventBus: eventBus,
+			eventBus,
 			totalNumberOfFields: 0,
 			errors: [] // Validation errors
 		};
@@ -105,9 +105,10 @@ export default {
 		// new model loaded
 		model: {
 			handler(newModel, oldModel) {
-				if (oldModel === newModel)
+				if (oldModel === newModel) {
 					// model property changed, skip
 					return;
+				}
 
 				if (newModel != null) {
 					this.$nextTick(() => {
@@ -131,8 +132,8 @@ export default {
 			if (isArray(fieldErrors) && fieldErrors.length > 0) {
 				fieldErrors.forEach((error) => {
 					errors.push({
-						uid: uid,
-						error: error
+						uid,
+						error
 					});
 				});
 			}
@@ -163,7 +164,7 @@ export default {
 				let formErrors = [];
 
 				this.eventBus.$on("field-deregistering", () => {
-					console.warn("Fields were deleted during validation process");
+					// console.warn("Fields were deleted during validation process");
 					this.eventBus.$emit("fields-validation-terminated", formErrors);
 					reject(formErrors);
 				});

src/formGroup.vue

@@ -31,7 +31,7 @@ export default {
 		tag: {
 			type: String,
 			default: "fieldset",
-			validator: function(value) {
+			validator(value) {
 				return value.length > 0;
 			}
 		},
@@ -74,9 +74,13 @@ export default {
 	methods: {
 		// Get visible prop of field
 		fieldVisible(field) {
-			if (isFunction(field.visible)) return field.visible.call(this, this.model, field, this);
+			if (isFunction(field.visible)) {
+				return field.visible.call(this, this.model, field, this);
+			}
 
-			if (isNil(field.visible)) return true;
+			if (isNil(field.visible)) {
+				return true;
+			}
 
 			return field.visible;
 		},

src/utils/validators.js

@@ -63,7 +63,9 @@ const validators = {
 
 	number(value, field, model, messages = resources) {
 		let res = checkEmpty(value, field.required, messages);
-		if (res != null) return res;
+		if (res != null) {
+			return res;
+		}
 
 		let err = [];
 		if (isNumber(value)) {
@@ -226,7 +228,7 @@ const validators = {
 			if (shouldDouble) {
 				tmpNum *= 2;
 				if (tmpNum >= 10) {
-					sum += tmpNum % 10 + 1;
+					sum += (tmpNum % 10) + 1;
 				} else {
 					sum += tmpNum;
 				}