- WIP add memory and disk usage

Client/src/Validation/error.js

@@ -22,14 +22,22 @@ const hasValidationErrors = (form, validation, setErrors) => {
 					"dbConnectionString",
 					"refreshTokenTTL",
 					"jwtTTL",
+					"notify-email-list",
 				].includes(err.path[0])
 			) {
 				newErrors[err.path[0]] = err.message ?? "Validation error";
 			}
+
 			// Handle conditionally usage number required cases
 			if (!form.cpu || (form.cpu && form.usage_cpu)) {
 				delete newErrors["usage_cpu"];
-			}
+			}			
+			if (!form.memory || (form.memory && form.usage_memory)) {
+				delete newErrors["usage_memory"];
+			}			
+			if (!form.disk || (form.disk && form.usage_disk)) {
+				delete newErrors["usage_disk"];
+			}						
 		});
 		if (Object.keys(newErrors).length > 0) {
 			setErrors(newErrors);

Client/src/Validation/validation.js

@@ -187,8 +187,16 @@ const infrastractureMonitorValidation = joi.object({
 		"any.required": "CPU threshold is required.",
 	}),		
 	cpu:joi.boolean(),
-	// usage_memory: joi.number(),
-	// usage_disk: joi.number(),
+	memory:joi.boolean(),
+	disk:joi.boolean(),
+	usage_memory: joi.number().messages({
+		"number.base": "Memory threshold must be a number.",
+		"any.required": "Memory threshold is required.",
+	}),		
+	usage_disk: joi.number().messages({
+		"number.base": "Disk threshold must be a number.",
+		"any.required": "Disk threshold is required.",
+	}),		
 	// usage_temperature: joi.number().messages({
 	// 	"number.base": "Temperature must be a number.",
 	// }),