Skip to content

Open-source status page, incident response and uptime monitoring

fix: notification setup improvements (#2536)

Maxe1a98255e39c
diff --git a/apps/dashboard/src/components/forms/components/telegram-form-actions.tsx b/apps/dashboard/src/components/forms/components/telegram-form-actions.tsx
index 6e715ed9c..6c8ccfa00 100644
--- a/apps/dashboard/src/components/forms/components/telegram-form-actions.tsx
+++ b/apps/dashboard/src/components/forms/components/telegram-form-actions.tsx
@@ -29,6 +29,13 @@ export function TelegramFormActions({
function testAction() {
if (isPending) return;
+ // Validate chat ID before sending test
+ const chatId = form.getValues("data.chatId");
+ if (!chatId || chatId.trim() === "") {
+ toast.error("Please enter a chat ID before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
diff --git a/apps/dashboard/src/components/forms/notifications/form-discord.tsx b/apps/dashboard/src/components/forms/notifications/form-discord.tsx
index b3273fd3e..0a2ad4cbd 100644
--- a/apps/dashboard/src/components/forms/notifications/form-discord.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-discord.tsx
@@ -30,7 +30,7 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("discord"),
data: z.url("Please enter a valid URL"),
monitors: z.array(z.number()),
@@ -97,10 +97,16 @@ export function FormDiscord({
function testAction() {
if (isPending) return;
+ // Validate webhook URL field before sending test
+ const data = form.getValues("data");
+ if (!data || data.trim() === "") {
+ toast.error("Please enter a webhook URL before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/apps/dashboard/src/components/forms/notifications/form-email.tsx b/apps/dashboard/src/components/forms/notifications/form-email.tsx
index a6c1d6815..0ee27e4d7 100644
--- a/apps/dashboard/src/components/forms/notifications/form-email.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-email.tsx
@@ -26,9 +26,13 @@ import { useFormSheetDirty } from "@/components/forms/form-sheet";
import { CheckboxTree } from "@/components/ui/checkbox-tree";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("email"),
- data: z.email(),
+ data: z
+ .string()
+ .trim()
+ .min(1, "Email is required")
+ .email("Please enter a valid email address"),
monitors: z.array(z.number()),
});
diff --git a/apps/dashboard/src/components/forms/notifications/form-google-chat.tsx b/apps/dashboard/src/components/forms/notifications/form-google-chat.tsx
index cdfa882c7..fa7a229fc 100644
--- a/apps/dashboard/src/components/forms/notifications/form-google-chat.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-google-chat.tsx
@@ -29,7 +29,7 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("google-chat"),
data: z.url("Please enter a valid URL"),
monitors: z.array(z.number()),
@@ -96,10 +96,16 @@ export function FormGoogleChat({
function testAction() {
if (isPending) return;
+ // Validate webhook URL field before sending test
+ const data = form.getValues("data");
+ if (!data || data.trim() === "") {
+ toast.error("Please enter a webhook URL before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/apps/dashboard/src/components/forms/notifications/form-grafana-oncall.tsx b/apps/dashboard/src/components/forms/notifications/form-grafana-oncall.tsx
index 0de2ba85b..0483e89b1 100644
--- a/apps/dashboard/src/components/forms/notifications/form-grafana-oncall.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-grafana-oncall.tsx
@@ -31,7 +31,7 @@ import { useTRPC } from "@/lib/trpc/client";
import { useFormSheetDirty } from "../form-sheet";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("grafana-oncall"),
data: z.record(z.string(), z.string()),
monitors: z.array(z.number()),
@@ -101,10 +101,16 @@ export function FormGrafanaOncall({
function testAction() {
if (isPending) return;
+ // Validate webhook URL field before sending test
+ const data = form.getValues("data");
+ if (!data.webhookUrl || data.webhookUrl.trim() === "") {
+ toast.error("Please enter a webhook URL before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/apps/dashboard/src/components/forms/notifications/form-ms-teams.tsx b/apps/dashboard/src/components/forms/notifications/form-ms-teams.tsx
index 087aec7fb..22affa127 100644
--- a/apps/dashboard/src/components/forms/notifications/form-ms-teams.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-ms-teams.tsx
@@ -31,7 +31,7 @@ import { useTRPC } from "@/lib/trpc/client";
import { useFormSheetDirty } from "../form-sheet";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("ms-teams"),
data: z.object({
webhookUrl: safeUrlSchema,
@@ -101,10 +101,16 @@ export function FormMsTeams({
function testAction() {
if (isPending) return;
+ // Validate webhook URL field before sending test
+ const data = form.getValues("data");
+ if (!data.webhookUrl || data.webhookUrl.trim() === "") {
+ toast.error("Please enter a webhook URL before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/apps/dashboard/src/components/forms/notifications/form-ntfy.tsx b/apps/dashboard/src/components/forms/notifications/form-ntfy.tsx
index fab7874e6..250b7779f 100644
--- a/apps/dashboard/src/components/forms/notifications/form-ntfy.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-ntfy.tsx
@@ -29,7 +29,7 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("ntfy"),
data: z.record(z.string(), z.string()),
monitors: z.array(z.number()),
@@ -100,10 +100,16 @@ export function FormNtfy({
function testAction() {
if (isPending) return;
+ // Validate topic field before sending test
+ const data = form.getValues("data");
+ if (!data.topic || data.topic.trim() === "") {
+ toast.error("Please enter a topic before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/apps/dashboard/src/components/forms/notifications/form-opsgenie.tsx b/apps/dashboard/src/components/forms/notifications/form-opsgenie.tsx
index afd5c3206..0b0df5c82 100644
--- a/apps/dashboard/src/components/forms/notifications/form-opsgenie.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-opsgenie.tsx
@@ -35,9 +35,14 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("opsgenie"),
- data: z.record(z.string(), z.string()),
+ data: z.object({
+ apiKey: z.string().trim().min(1, "API key is required"),
+ region: z.enum(["us", "eu"], {
+ message: "Please select a region",
+ }),
+ }),
monitors: z.array(z.number()),
});
@@ -99,10 +104,22 @@ export function FormOpsGenie({
function testAction() {
if (isPending) return;
+ // Validate API key field before sending test
+ const data = form.getValues("data");
+ if (!data.apiKey || data.apiKey.trim() === "") {
+ toast.error("Please enter an API key before sending test");
+ return;
+ }
+
+ // Validate region field before sending test
+ if (!data.region) {
+ toast.error("Please select a region before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/apps/dashboard/src/components/forms/notifications/form-pagerduty.tsx b/apps/dashboard/src/components/forms/notifications/form-pagerduty.tsx
index d51c9f666..250234de0 100644
--- a/apps/dashboard/src/components/forms/notifications/form-pagerduty.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-pagerduty.tsx
@@ -31,9 +31,9 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("pagerduty"),
- data: z.string(),
+ data: z.string().trim().min(1, "PagerDuty configuration is required"),
monitors: z.array(z.number()),
});
@@ -115,8 +115,10 @@ export function FormPagerDuty({
try {
const provider = form.getValues("provider");
const data = form.getValues("data");
- if (!data) {
- toast.error("No PagerDuty configuration found");
+ if (!data || data.trim() === "") {
+ toast.error(
+ "Please enter PagerDuty configuration before sending test",
+ );
return;
}
const promise = sendTestMutation.mutateAsync({
diff --git a/apps/dashboard/src/components/forms/notifications/form-slack.tsx b/apps/dashboard/src/components/forms/notifications/form-slack.tsx
index 8dcf0446b..2aaefa8ba 100644
--- a/apps/dashboard/src/components/forms/notifications/form-slack.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-slack.tsx
@@ -30,7 +30,7 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("slack"),
data: z.url("Please enter a valid URL"),
monitors: z.array(z.number()),
@@ -97,10 +97,16 @@ export function FormSlack({
function testAction() {
if (isPending) return;
+ // Validate webhook URL field before sending test
+ const data = form.getValues("data");
+ if (!data || data.trim() === "") {
+ toast.error("Please enter a webhook URL before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/apps/dashboard/src/components/forms/notifications/form-sms.tsx b/apps/dashboard/src/components/forms/notifications/form-sms.tsx
index dad393b62..4eb9629e9 100644
--- a/apps/dashboard/src/components/forms/notifications/form-sms.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-sms.tsx
@@ -25,9 +25,9 @@ import { useFormSheetDirty } from "@/components/forms/form-sheet";
import { CheckboxTree } from "@/components/ui/checkbox-tree";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("sms"),
- data: z.string(),
+ data: z.string().trim().min(1, "Phone number is required"),
monitors: z.array(z.number()),
});
@@ -108,7 +108,7 @@ export function FormSms({
name="data"
render={({ field }) => (
<FormItem>
- <FormLabel>SMS</FormLabel>
+ <FormLabel>Phone Number</FormLabel>
<FormControl>
<Input placeholder="+1234567890" type="tel" {...field} />
</FormControl>
diff --git a/apps/dashboard/src/components/forms/notifications/form-telegram.tsx b/apps/dashboard/src/components/forms/notifications/form-telegram.tsx
index a005f2a3e..dbc03e3b4 100644
--- a/apps/dashboard/src/components/forms/notifications/form-telegram.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-telegram.tsx
@@ -30,10 +30,10 @@ import { TelegramFormActions } from "../components/telegram-form-actions";
import { TelegramManualInput } from "../components/telegram-manual-input";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("telegram"),
data: z.object({
- chatId: z.string(),
+ chatId: z.string().trim().min(1, "Chat ID is required"),
}),
monitors: z.array(z.number()),
});
diff --git a/apps/dashboard/src/components/forms/notifications/form-webhook.tsx b/apps/dashboard/src/components/forms/notifications/form-webhook.tsx
index 9d838cc49..844effd79 100644
--- a/apps/dashboard/src/components/forms/notifications/form-webhook.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-webhook.tsx
@@ -31,7 +31,7 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("webhook"),
data: z.object({
endpoint: z.string().url(),
@@ -113,10 +113,16 @@ export function FormWebhook({
function testAction() {
if (isPending) return;
+ // Validate webhook endpoint before sending test
+ const endpoint = form.getValues("data.endpoint");
+ if (!endpoint || endpoint.trim() === "") {
+ toast.error("Please enter a webhook URL before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const endpoint = form.getValues("data.endpoint");
const headers = form.getValues("data.headers");
const promise = sendTestMutation.mutateAsync({
provider,
diff --git a/apps/dashboard/src/components/forms/notifications/form-whatsapp.tsx b/apps/dashboard/src/components/forms/notifications/form-whatsapp.tsx
index 025030d8e..19c713cb6 100644
--- a/apps/dashboard/src/components/forms/notifications/form-whatsapp.tsx
+++ b/apps/dashboard/src/components/forms/notifications/form-whatsapp.tsx
@@ -29,9 +29,9 @@ import { CheckboxTree } from "@/components/ui/checkbox-tree";
import { useTRPC } from "@/lib/trpc/client";
const schema = z.object({
- name: z.string(),
+ name: z.string().trim().min(1, "Name is required"),
provider: z.literal("whatsapp"),
- data: z.string(),
+ data: z.string().trim().min(1, "Phone number is required"),
monitors: z.array(z.number()),
});
@@ -96,10 +96,16 @@ export function FormWhatsApp({
function testAction() {
if (isPending) return;
+ // Validate phone number field before sending test
+ const data = form.getValues("data");
+ if (!data || data.trim() === "") {
+ toast.error("Please enter a phone number before sending test");
+ return;
+ }
+
startTransition(async () => {
try {
const provider = form.getValues("provider");
- const data = form.getValues("data");
const promise = sendTestMutation.mutateAsync({
provider,
data: {
diff --git a/packages/db/src/schema/notifications/validation.ts b/packages/db/src/schema/notifications/validation.ts
index 063384b0f..3095acf76 100644
--- a/packages/db/src/schema/notifications/validation.ts
+++ b/packages/db/src/schema/notifications/validation.ts
@@ -61,7 +61,9 @@ export const pagerdutyDataSchema = z.object({ pagerduty: z.string() });
export const opsgenieDataSchema = z.object({
opsgenie: z.object({
apiKey: z.string(),
- region: z.enum(["us", "eu"]),
+ region: z.enum(["us", "eu"], {
+ message: "Please select a region",
+ }),
}),
});
export const telegramDataSchema = z.object({