From 93be5d3dbf1151f53abadd7f3ea9437a56b1c866 Mon Sep 17 00:00:00 2001 From: Alexander Borg Date: Thu, 28 Aug 2025 13:13:57 +0200 Subject: [PATCH] Fix jwt-token --- client/src/pages/Alerts.jsx | 1 + server/routes/alert.js | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/src/pages/Alerts.jsx b/client/src/pages/Alerts.jsx index 9ea0105..d8654b8 100644 --- a/client/src/pages/Alerts.jsx +++ b/client/src/pages/Alerts.jsx @@ -497,6 +497,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => { const payload = { ...formData }; // Clean up empty values + if (!payload.description || payload.description.trim() === '') delete payload.description; if (!payload.min_rssi) delete payload.min_rssi; if (!payload.max_rssi) delete payload.max_rssi; if (!payload.device_ids || payload.device_ids.length === 0) payload.device_ids = null; diff --git a/server/routes/alert.js b/server/routes/alert.js index 312ad70..12e27a9 100644 --- a/server/routes/alert.js +++ b/server/routes/alert.js @@ -9,15 +9,11 @@ const { Op } = require('sequelize'); // Validation schemas const alertRuleSchema = Joi.object({ name: Joi.string().required(), - description: Joi.string().optional(), + description: Joi.string().allow('').optional(), device_ids: Joi.array().items(Joi.number().integer()).optional(), drone_types: Joi.array().items(Joi.number().integer()).optional(), min_rssi: Joi.number().integer().optional(), max_rssi: Joi.number().integer().optional(), - frequency_ranges: Joi.array().items(Joi.object({ - min: Joi.number().integer().required(), - max: Joi.number().integer().required() - })).optional(), time_window: Joi.number().integer().min(60).max(3600).default(300), min_detections: Joi.number().integer().min(1).default(1), cooldown_period: Joi.number().integer().min(0).default(600),