borg/drone-detector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix jwt-token

Browse Source
This commit is contained in:
Alexander Borg
2025-09-23 09:41:58 +02:00
parent 1905306a9b
commit 9d31bbcc58
2 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
client/src/pages/Alerts.jsx
View File

@@ -366,14 +366,25 @@ const Alerts = () => {
</td>
<td>
<div className="flex space-x-1">
{(rule.alert_channels || []).map((channel, index) => (
<span
key={index}
className="px-2 py-1 bg-blue-100 text-blue-800 rounded text-xs"
>
{channel}
</span>
))}
{(() => {
// Normalize alert_channels - ensure it's always an array
let alertChannels = rule.alert_channels || [];
if (typeof alertChannels === 'object' && !Array.isArray(alertChannels)) {
// Convert object like {sms: true, webhook: false, email: true} to array
alertChannels = Object.keys(alertChannels).filter(key => alertChannels[key]);
}
if (!Array.isArray(alertChannels)) {
alertChannels = []; // fallback to empty array
}
return alertChannels.map((channel, index) => (
<span
key={index}
className="px-2 py-1 bg-blue-100 text-blue-800 rounded text-xs"
>
{channel}
</span>
));
})()}
</div>
</td>
<td>
@@ -860,12 +871,17 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
};
const handleChannelChange = (channel, checked) => {
setFormData(prev => ({
...prev,
alert_channels: checked
? [...prev.alert_channels, channel]
: prev.alert_channels.filter(c => c !== channel)
}));
setFormData(prev => {
// Ensure alert_channels is always an array
const currentChannels = Array.isArray(prev.alert_channels) ? prev.alert_channels : [];
return {
...prev,
alert_channels: checked
? [...currentChannels, channel]
: currentChannels.filter(c => c !== channel)
};
});
};
const handleDroneTypeChange = (droneType, checked) => {
@@ -1000,7 +1016,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
<label key={channel} className="flex items-center">
<input
type="checkbox"
checked={formData.alert_channels.includes(channel)}
checked={Array.isArray(formData.alert_channels) && formData.alert_channels.includes(channel)}
onChange={(e) => handleChannelChange(channel, e.target.checked)}
className="h-4 w-4 text-primary-600 focus:ring-primary-500 border-gray-300 rounded"
/>
@@ -1074,7 +1090,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
</div>
{/* Conditional channel-specific fields */}
{formData.alert_channels.includes('sms') && (
{Array.isArray(formData.alert_channels) && formData.alert_channels.includes('sms') && (
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
SMS Phone Number
@@ -1093,7 +1109,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
</div>
)}
{formData.alert_channels.includes('webhook') && (
{Array.isArray(formData.alert_channels) && formData.alert_channels.includes('webhook') && (
<div>
<label className="block text-sm font-medium text-gray-700 mb-1">
Webhook URL *
@@ -1102,7 +1118,7 @@ const CreateAlertRuleModal = ({ onClose, onSave }) => {
type="url"
name="webhook_url"
placeholder="https://your-webhook-endpoint.com/alerts"
required={formData.alert_channels.includes('webhook')}
required={Array.isArray(formData.alert_channels) && formData.alert_channels.includes('webhook')}
className="w-full border border-gray-300 rounded-md px-3 py-2 focus:ring-primary-500 focus:border-primary-500"
value={formData.webhook_url || ''}
onChange={handleChange}