From bb921690bf87a8591b75316ac6df6c6339e5605c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 18 Jun 2025 14:42:39 +0800 Subject: [PATCH] Update validation --- client/src/Validation/validation.js | 58 +++++------------------------ 1 file changed, 9 insertions(+), 49 deletions(-) diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js index 02d957063..4e6a806c8 100644 --- a/client/src/Validation/validation.js +++ b/client/src/Validation/validation.js @@ -404,57 +404,19 @@ const infrastructureMonitorValidation = joi.object({ notifications: joi.array().items(joi.string()), }); -const notificationEmailValidation = joi.object({ +const notificationValidation = joi.object({ notificationName: joi.string().required().messages({ "string.empty": "Notification name is required", "any.required": "Notification name is required", }), - address: joi - .string() - .email({ tlds: { allow: false } }) - .required() - .messages({ - "string.empty": "E-mail address cannot be empty", - - "string.email": "Please enter a valid e-mail address", - "string.base": "E-mail address must be a string", - "any.required": "E-mail address is required", - }), -}); -const notificationWebhookValidation = joi.object({ - notificationName: joi.string().required().messages({ - "string.empty": "Notification name is required", - "any.required": "Notification name is required", + address: joi.string().required().messages({ + "string.empty": "This field cannot be empty", + "string.base": "This field must be a string", + "any.required": "This field is required", }), - config: joi - .object({ - webhookUrl: joi.string().uri().required().messages({ - "string.empty": "Webhook URL is required", - "string.uri": "Webhook URL must be a valid URI", - "any.required": "Webhook URL is required", - }), - platform: joi.string().required().messages({ - "string.base": "Platform must be a string", - "any.required": "Platform is required", - }), - }) - .unknown(true), -}); - -const notificationPagerDutyValidation = joi.object({ - notificationName: joi.string().required().messages({ - "string.empty": "Notification name is required", - "any.required": "Notification name is required", - }), - config: joi.object({ - platform: joi.string().required().messages({ - "string.base": "Platform must be a string", - "any.required": "Platform is required", - }), - routingKey: joi.string().required().messages({ - "string.empty": "Routing key is required", - "any.required": "Routing key is required", - }), + type: joi.string().required().messages({ + "string.empty": "This field is required", + "any.required": "This field is required", }), }); @@ -469,7 +431,5 @@ export { infrastructureMonitorValidation, statusPageValidation, logoImageValidation, - notificationEmailValidation, - notificationWebhookValidation, - notificationPagerDutyValidation, + notificationValidation, };