From 62d5ae82367b342e48e5972b400044c19ae8b4f6 Mon Sep 17 00:00:00 2001
From: Henry Dollman <hank@henrygd.me>
Date: Sat, 14 Sep 2024 15:46:42 -0400
Subject: [PATCH] clean up / small refactoring

---
 beszel/internal/alerts/alerts.go                    |  5 +----
 .../components/routes/settings/notifications.tsx    | 13 ++++++++-----
 beszel/site/src/components/table-alerts.tsx         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/beszel/internal/alerts/alerts.go b/beszel/internal/alerts/alerts.go
index 7e840c8..dbebc11 100644
--- a/beszel/internal/alerts/alerts.go
+++ b/beszel/internal/alerts/alerts.go
@@ -4,7 +4,6 @@ package alerts
 import (
 	"beszel/internal/entities/system"
 	"fmt"
-	"log"
 	"net/mail"
 	"net/url"
 
@@ -179,8 +178,7 @@ func (am *AlertManager) sendAlert(data AlertData) {
 	}
 	// send alerts via webhooks
 	for _, webhook := range userAlertSettings.Webhooks {
-		err := am.SendShoutrrrAlert(webhook, data.Title, data.Message, data.Link, data.LinkText)
-		if err != nil {
+		if err := am.SendShoutrrrAlert(webhook, data.Title, data.Message, data.Link, data.LinkText); err != nil {
 			am.app.Logger().Error("Failed to send shoutrrr alert", "err", err.Error())
 		}
 	}
@@ -202,7 +200,6 @@ func (am *AlertManager) sendAlert(data AlertData) {
 			Name:    am.app.Settings().Meta.SenderName,
 		},
 	}
-	log.Println("Sending alert via email")
 	if err := am.app.NewMailClient().Send(&message); err != nil {
 		am.app.Logger().Error("Failed to send alert: ", "err", err.Error())
 	} else {
diff --git a/beszel/site/src/components/routes/settings/notifications.tsx b/beszel/site/src/components/routes/settings/notifications.tsx
index 8e6d0e0..43c200a 100644
--- a/beszel/site/src/components/routes/settings/notifications.tsx
+++ b/beszel/site/src/components/routes/settings/notifications.tsx
@@ -5,7 +5,7 @@ import { pb } from '@/lib/stores'
 import { Separator } from '@/components/ui/separator'
 import { Card } from '@/components/ui/card'
 import { BellIcon, LoaderCircleIcon, PlusIcon, SaveIcon, Trash2Icon } from 'lucide-react'
-import { useState } from 'react'
+import { ChangeEventHandler, useState } from 'react'
 import { toast } from '@/components/ui/use-toast'
 import { InputTags } from '@/components/ui/input-tags'
 import { UserSettings } from '@/types'
@@ -15,7 +15,7 @@ import { isAdmin } from '@/lib/utils'
 
 interface ShoutrrrUrlCardProps {
 	url: string
-	onUrlChange: (value: string) => void
+	onUrlChange: ChangeEventHandler<HTMLInputElement>
 	onRemove: () => void
 }
 
@@ -61,7 +61,7 @@ const SettingsNotificationsPage = ({ userSettings }: { userSettings: UserSetting
 					Configure how you receive alert notifications.
 				</p>
 				<p className="text-sm text-muted-foreground mt-1.5 leading-relaxed">
-					Looking instead for where to create system alerts? Click the bell{' '}
+					Looking instead for where to create alerts? Click the bell{' '}
 					<BellIcon className="inline h-4 w-4" /> icons in the systems table.
 				</p>
 			</div>
@@ -117,7 +117,9 @@ const SettingsNotificationsPage = ({ userSettings }: { userSettings: UserSetting
 								<ShoutrrrUrlCard
 									key={index}
 									url={webhook}
-									onUrlChange={(value: string) => updateWebhook(index, value)}
+									onUrlChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+										updateWebhook(index, e.target.value)
+									}
 									onRemove={() => removeWebhook(index)}
 								/>
 							))}
@@ -178,11 +180,12 @@ const ShoutrrrUrlCard = ({ url, onUrlChange, onRemove }: ShoutrrrUrlCardProps) =
 		<Card className="bg-muted/30 p-2 md:p-3">
 			<div className="flex items-center gap-1">
 				<Input
+					type="url"
 					className="light:bg-card"
 					required
 					placeholder="generic://webhook.site/xxxxxx"
 					value={url}
-					onChange={(e) => onUrlChange(e.target.value)}
+					onChange={onUrlChange}
 				/>
 				<Button
 					type="button"
diff --git a/beszel/site/src/components/table-alerts.tsx b/beszel/site/src/components/table-alerts.tsx
index 45b70f9..933e394 100644
--- a/beszel/site/src/components/table-alerts.tsx
+++ b/beszel/site/src/components/table-alerts.tsx
@@ -9,7 +9,7 @@ import {
 	DialogTitle,
 } from '@/components/ui/dialog'
 import { BellIcon } from 'lucide-react'
-import { cn, isAdmin } from '@/lib/utils'
+import { cn } from '@/lib/utils'
 import { Button } from '@/components/ui/button'
 import { Switch } from '@/components/ui/switch'
 import { AlertRecord, SystemRecord } from '@/types'