diff --git a/client/package-lock.json b/client/package-lock.json
index b4ad9f73c..d860ae844 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -29,7 +29,7 @@
"pretty-ms": "^9.3.0",
"react": "18.3.1",
"react-dom": "^18.2.0",
- "react-hook-form": "7.63.0",
+ "react-hook-form": "^7.63.0",
"react-i18next": "^15.4.0",
"react-icons": "5.5.0",
"react-redux": "9.2.0",
@@ -40,7 +40,7 @@
"redux-persist": "6.0.0",
"swr": "^2.3.6",
"vite-plugin-svgr": "^4.2.0",
- "zod": "4.1.11"
+ "zod": "^4.1.11"
},
"devDependencies": {
"@types/node": "24.5.2",
diff --git a/client/package.json b/client/package.json
index a5c17e343..09599143a 100644
--- a/client/package.json
+++ b/client/package.json
@@ -34,7 +34,7 @@
"pretty-ms": "^9.3.0",
"react": "18.3.1",
"react-dom": "^18.2.0",
- "react-hook-form": "7.63.0",
+ "react-hook-form": "^7.63.0",
"react-i18next": "^15.4.0",
"react-icons": "5.5.0",
"react-redux": "9.2.0",
@@ -45,7 +45,7 @@
"redux-persist": "6.0.0",
"swr": "^2.3.6",
"vite-plugin-svgr": "^4.2.0",
- "zod": "4.1.11"
+ "zod": "^4.1.11"
},
"devDependencies": {
"@types/node": "24.5.2",
diff --git a/client/src/Components/v1/NotificationIntegrationModal/Components/NotificationIntegrationModal.jsx b/client/src/Components/v1/NotificationIntegrationModal/Components/NotificationIntegrationModal.jsx
deleted file mode 100644
index 2aae996f6..000000000
--- a/client/src/Components/v1/NotificationIntegrationModal/Components/NotificationIntegrationModal.jsx
+++ /dev/null
@@ -1,419 +0,0 @@
-import { useState, useMemo, useEffect, useCallback } from "react";
-import { useTranslation } from "react-i18next";
-import PropTypes from "prop-types";
-
-import {
- Dialog,
- DialogContent,
- DialogActions,
- Button,
- Typography,
- Box,
- Tabs,
- Tab,
- Stack,
-} from "@mui/material";
-import { useTheme } from "@emotion/react";
-import TabPanel from "./TabPanel.jsx";
-import TabComponent from "./TabComponent.jsx";
-import useNotifications from "../Hooks/useNotification.js";
-
-// Define constants for notification types to avoid magic values
-const NOTIFICATION_TYPES = {
- SLACK: "slack",
- DISCORD: "discord",
- TELEGRAM: "telegram",
- WEBHOOK: "webhook",
-};
-
-// Define constants for field IDs
-const FIELD_IDS = {
- WEBHOOK: "webhook",
- TOKEN: "token",
- CHAT_ID: "chatId",
- URL: "url",
-};
-
-const NotificationIntegrationModal = ({
- open,
- onClose,
- monitor,
- setMonitor,
- // Optional prop to configure available notification types
- notificationTypes = null,
-}) => {
- const { t } = useTranslation();
- const theme = useTheme();
- const [tabValue, setTabValue] = useState(0);
-
- const [loading, _, sendTestNotification] = useNotifications();
-
- // Helper to get the field state key with error handling
- const getFieldKey = useCallback(
- (typeId, fieldId) => {
- if (typeof typeId !== "string" || typeId === "") {
- throw new Error(t("errorInvalidTypeId"));
- }
-
- if (typeof fieldId !== "string" || fieldId === "") {
- throw new Error(t("errorInvalidFieldId"));
- }
-
- return `${typeId}${fieldId.charAt(0).toUpperCase() + fieldId.slice(1)}`;
- },
- [t]
- );
-
- // Define notification types
- const DEFAULT_NOTIFICATION_TYPES = [
- {
- id: NOTIFICATION_TYPES.SLACK,
- label: t("notifications.slack.label"),
- description: t("notifications.slack.description"),
- fields: [
- {
- id: FIELD_IDS.WEBHOOK,
- label: t("notifications.slack.webhookLabel"),
- placeholder: t("notifications.slack.webhookPlaceholder"),
- type: "text",
- },
- ],
- },
- {
- id: NOTIFICATION_TYPES.DISCORD,
- label: t("notifications.discord.label"),
- description: t("notifications.discord.description"),
- fields: [
- {
- id: FIELD_IDS.WEBHOOK,
- label: t("notifications.discord.webhookLabel"),
- placeholder: t("notifications.discord.webhookPlaceholder"),
- type: "text",
- },
- ],
- },
- {
- id: NOTIFICATION_TYPES.TELEGRAM,
- label: t("notifications.telegram.label"),
- description: t("notifications.telegram.description"),
- fields: [
- {
- id: FIELD_IDS.TOKEN,
- label: t("notifications.telegram.tokenLabel"),
- placeholder: t("notifications.telegram.tokenPlaceholder"),
- type: "text",
- },
- {
- id: FIELD_IDS.CHAT_ID,
- label: t("notifications.telegram.chatIdLabel"),
- placeholder: t("notifications.telegram.chatIdPlaceholder"),
- type: "text",
- },
- ],
- },
- {
- id: NOTIFICATION_TYPES.WEBHOOK,
- label: t("notifications.webhook.label"),
- description: t("notifications.webhook.description"),
- fields: [
- {
- id: FIELD_IDS.URL,
- label: t("notifications.webhook.urlLabel"),
- placeholder: t("notifications.webhook.urlPlaceholder"),
- type: "text",
- },
- ],
- },
- ];
-
- // Use provided notification types or default to our translated ones
- const activeNotificationTypes = notificationTypes || DEFAULT_NOTIFICATION_TYPES;
-
- // Memoized function to initialize integrations state
- const initialIntegrationsState = useMemo(() => {
- const state = {};
-
- activeNotificationTypes.forEach((type) => {
- // Add enabled flag for each notification type
- state[type.id] = false;
-
- // Add state for each field in the notification type
- type.fields.forEach((field) => {
- const fieldKey = getFieldKey(type.id, field.id);
- state[fieldKey] = "";
- });
- });
-
- return state;
- }, [activeNotificationTypes, getFieldKey]); // Only recompute when these dependencies change
-
- const [integrations, setIntegrations] = useState(initialIntegrationsState);
-
- useEffect(() => {
- if (open) {
- const extractNotificationValues = () => {
- const values = {};
-
- if (!monitor?.notifications || !Array.isArray(monitor.notifications)) {
- return values;
- }
-
- monitor.notifications.forEach((notification) => {
- // Handle notification based on its structure
- if (notification.type === "webhook" && notification.platform) {
- if (typeof notification.config === "undefined") return;
- const platform = notification.platform;
- values[platform] = true; // Set platform as enabled
-
- // Extract configuration based on platform
- switch (platform) {
- case NOTIFICATION_TYPES.SLACK:
- case NOTIFICATION_TYPES.DISCORD:
- if (notification.config.webhookUrl) {
- values[getFieldKey(platform, FIELD_IDS.WEBHOOK)] =
- notification.config.webhookUrl;
- }
- break;
- case NOTIFICATION_TYPES.TELEGRAM:
- if (notification.config.botToken) {
- values[getFieldKey(platform, FIELD_IDS.TOKEN)] =
- notification.config.botToken;
- }
- if (notification.config.chatId) {
- values[getFieldKey(platform, FIELD_IDS.CHAT_ID)] =
- notification.config.chatId;
- }
- break;
- case NOTIFICATION_TYPES.WEBHOOK:
- if (notification.config.webhookUrl) {
- values[getFieldKey(platform, FIELD_IDS.URL)] =
- notification.config.webhookUrl;
- }
- break;
- }
- }
- });
-
- return values;
- };
-
- const extractedValues = extractNotificationValues();
- setIntegrations((prev) => ({
- ...prev,
- ...extractedValues,
- }));
- }
- }, [open, monitor, getFieldKey]);
-
- const handleChangeTab = (event, newValue) => {
- setTabValue(newValue);
- };
-
- const handleIntegrationChange = (type, checked) => {
- setIntegrations((prev) => ({
- ...prev,
- [type]: checked,
- }));
- };
-
- const handleInputChange = (type, value) => {
- setIntegrations((prev) => ({
- ...prev,
- [type]: value,
- }));
- };
-
- const handleTestNotification = async (type) => {
- // Get the notification type details
- const notificationType = activeNotificationTypes.find((t) => t.id === type);
-
- if (typeof notificationType === "undefined") {
- return;
- }
-
- // Prepare config object based on notification type
- const config = {};
-
- // Add each field value to the config object
- notificationType.fields.forEach((field) => {
- const fieldKey = getFieldKey(type, field.id);
- config[field.id] = integrations[fieldKey];
- });
-
- await sendTestNotification(type, config);
- };
-
- // In NotificationIntegrationModal.jsx, update the handleSave function:
-
- const handleSave = () => {
- // Get existing notifications
- const notifications = [...(monitor?.notifications || [])];
-
- // Get all notification types IDs
- const existingTypes = activeNotificationTypes.map((type) => type.id);
-
- // Filter out notifications that are configurable in this modal
- const filteredNotifications = notifications.filter((notification) => {
- if (notification.platform) {
- return !existingTypes.includes(notification.platform);
- }
-
- return !existingTypes.includes(notification.type);
- });
-
- // Add each enabled notification with its configured fields
- activeNotificationTypes.forEach((type) => {
- if (integrations[type.id]) {
- let notificationObject = {
- type: "webhook",
- platform: type.id, // Set platform to identify the specific service
- config: {},
- };
-
- // Configure based on notification type
- switch (type.id) {
- case "slack":
- case "discord":
- notificationObject.config.webhookUrl =
- integrations[getFieldKey(type.id, "webhook")];
- break;
- case "telegram":
- notificationObject.config.botToken =
- integrations[getFieldKey(type.id, "token")];
- notificationObject.config.chatId =
- integrations[getFieldKey(type.id, "chatId")];
- break;
- case "webhook":
- notificationObject.config.webhookUrl =
- integrations[getFieldKey(type.id, "url")];
- break;
- }
-
- filteredNotifications.push(notificationObject);
- }
- });
-
- // Update monitor with new notifications
- setMonitor((prev) => ({
- ...prev,
- notifications: filteredNotifications,
- }));
-
- onClose();
- };
-
- return (
-
- );
-};
-
-NotificationIntegrationModal.propTypes = {
- open: PropTypes.bool.isRequired,
- onClose: PropTypes.func.isRequired,
- monitor: PropTypes.object.isRequired,
- setMonitor: PropTypes.func.isRequired,
- notificationTypes: PropTypes.array,
-};
-
-export default NotificationIntegrationModal;
diff --git a/client/src/Components/v1/NotificationIntegrationModal/Components/TabComponent.jsx b/client/src/Components/v1/NotificationIntegrationModal/Components/TabComponent.jsx
deleted file mode 100644
index 87fb2c301..000000000
--- a/client/src/Components/v1/NotificationIntegrationModal/Components/TabComponent.jsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import React from "react";
-import { Typography, Box, Button, CircularProgress } from "@mui/material";
-import { useTranslation } from "react-i18next";
-import { useTheme } from "@emotion/react";
-import TextInput from "../../Inputs/TextInput/index.jsx";
-import Checkbox from "../../Inputs/Checkbox/index.jsx";
-
-const TabComponent = ({
- type,
- integrations,
- handleIntegrationChange,
- handleInputChange,
- handleTestNotification,
- isLoading,
-}) => {
- const theme = useTheme();
- const { t } = useTranslation();
-
- // Helper to get the field state key (e.g., slackWebhook, telegramToken)
- const getFieldKey = (typeId, fieldId) => {
- return `${typeId}${fieldId.charAt(0).toUpperCase() + fieldId.slice(1)}`;
- };
-
- // Check if all fields have values to enable test button
- const areAllFieldsFilled = () => {
- return type.fields.every((field) => {
- const fieldKey = getFieldKey(type.id, field.id);
- return integrations[fieldKey];
- });
- };
-
- return (
- <>
-
- {type.label}
-
-
-
- {type.description}
-
-
-
- handleIntegrationChange(type.id, e.target.checked)}
- disabled={isLoading}
- />
-
-
- {type.fields.map((field) => {
- const fieldKey = getFieldKey(type.id, field.id);
-
- return (
-
-
- {field.label}
-
-
- handleInputChange(fieldKey, e.target.value)}
- disabled={!integrations[type.id] || isLoading}
- />
-
- );
- })}
-
-
-
-
- >
- );
-};
-
-export default TabComponent;
diff --git a/client/src/Components/v1/NotificationIntegrationModal/Components/TabPanel.jsx b/client/src/Components/v1/NotificationIntegrationModal/Components/TabPanel.jsx
deleted file mode 100644
index 93546e7bc..000000000
--- a/client/src/Components/v1/NotificationIntegrationModal/Components/TabPanel.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { Box } from "@mui/material";
-import { useTheme } from "@emotion/react";
-
-/**
- * TabPanel component that displays content for the selected tab.
- *
- * @component
- * @param {Object} props - The component props.
- * @param {React.ReactNode} props.children - The content to be displayed when this tab panel is selected.
- * @param {number} props.value - The currently selected tab value.
- * @param {number} props.index - The index of this specific tab panel.
- * @param {Object} props.other - Any additional props to be spread to the root element.
- * @returns {React.ReactElement|null} The rendered tab panel or null if not selected.
- */
-function TabPanel({ children, value, index, ...other }) {
- const theme = useTheme();
-
- return (
-
- {value === index && {children}}
-
- );
-}
-
-TabPanel.propTypes = {
- children: PropTypes.node,
-
- index: PropTypes.number.isRequired,
-
- value: PropTypes.number.isRequired,
-};
-
-export default TabPanel;
diff --git a/client/src/Components/v1/NotificationIntegrationModal/Hooks/useNotification.js b/client/src/Components/v1/NotificationIntegrationModal/Hooks/useNotification.js
deleted file mode 100644
index c0712fa5f..000000000
--- a/client/src/Components/v1/NotificationIntegrationModal/Hooks/useNotification.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { networkService } from "../../../../Utils/NetworkService.js";
-import { createToast } from "../../../../Utils/toastUtils.jsx";
-
-// Define constants for notification types to avoid magic values
-const NOTIFICATION_TYPES = {
- SLACK: "slack",
- DISCORD: "discord",
- TELEGRAM: "telegram",
- WEBHOOK: "webhook",
-};
-
-// Define constants for field IDs
-const FIELD_IDS = {
- WEBHOOK: "webhook",
- TOKEN: "token",
- CHAT_ID: "chatId",
- URL: "url",
-};
-
-/**
- * Custom hook for notification-related operations
- */
-const useNotifications = () => {
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState(undefined);
- const { t } = useTranslation();
-
- /**
- * Send a test notification
- * @param {string} type - The notification type (slack, discord, telegram, webhook)
- * @param {object} config - Configuration object with necessary params
- */
- const sendTestNotification = async (type, config) => {
- setLoading(true);
- setError(undefined);
-
- // Validation based on notification type
- let payload = { platform: type };
- let isValid = true;
- let errorMessage = "";
-
- switch (type) {
- case NOTIFICATION_TYPES.SLACK:
- payload.webhookUrl = config.webhook;
- if (typeof payload.webhookUrl === "undefined" || payload.webhookUrl === "") {
- isValid = false;
- errorMessage = t("notifications.slack.webhookRequired");
- }
- break;
-
- case NOTIFICATION_TYPES.DISCORD:
- payload.webhookUrl = config.webhook;
- if (typeof payload.webhookUrl === "undefined" || payload.webhookUrl === "") {
- isValid = false;
- errorMessage = t("notifications.discord.webhookRequired");
- }
- break;
-
- case NOTIFICATION_TYPES.TELEGRAM:
- payload.botToken = config.token;
- payload.chatId = config.chatId;
- if (
- typeof payload.botToken === "undefined" ||
- payload.botToken === "" ||
- typeof payload.chatId === "undefined" ||
- payload.chatId === ""
- ) {
- isValid = false;
- errorMessage = t("notifications.telegram.fieldsRequired");
- }
- break;
-
- case NOTIFICATION_TYPES.WEBHOOK:
- payload.webhookUrl = config.url;
- payload.platform = NOTIFICATION_TYPES.SLACK;
- if (typeof payload.webhookUrl === "undefined" || payload.webhookUrl === "") {
- isValid = false;
- errorMessage = t("notifications.webhook.urlRequired");
- }
- break;
-
- default:
- isValid = false;
- errorMessage = t("notifications.unsupportedType");
- }
-
- // If validation fails, show error and return
- if (isValid === false) {
- createToast({
- body: errorMessage,
- variant: "error",
- });
- setLoading(false);
- return;
- }
-
- try {
- const response = await networkService.testNotification({
- platform: type,
- payload: payload,
- });
-
- if (response.data.success === true) {
- createToast({
- body: t("notifications.testSuccess"),
- variant: "info",
- });
- } else {
- throw new Error(response.data.msg || t("notifications.testFailed"));
- }
- } catch (error) {
- const errorMsg =
- error.response?.data?.msg || error.message || t("notifications.networkError");
- createToast({
- body: `${t("notifications.testFailed")}: ${errorMsg}`,
- variant: "error",
- });
- setError(errorMsg);
- } finally {
- setLoading(false);
- }
- };
-
- return [loading, error, sendTestNotification];
-};
-
-export default useNotifications;
diff --git a/client/src/Components/v2/design-elements/Breadcrumb.tsx b/client/src/Components/v2/design-elements/Breadcrumb.tsx
index 492ed0ec9..e0a310c9f 100644
--- a/client/src/Components/v2/design-elements/Breadcrumb.tsx
+++ b/client/src/Components/v2/design-elements/Breadcrumb.tsx
@@ -3,20 +3,35 @@ import Typography from "@mui/material/Typography";
import { Link, useLocation } from "react-router-dom";
import { useTheme } from "@mui/material/styles";
import { ChevronRight } from "lucide-react";
+import { useTranslation } from "react-i18next";
const isId = (segment: string): boolean => {
return segment.length === 24 || /^[a-f0-9-]{36}$/.test(segment);
};
+const actionSegments = ["create", "configure"];
+
export const Breadcrumb = () => {
+ const { t } = useTranslation();
const theme = useTheme();
const location = useLocation();
const segments = location.pathname.split("/").filter((x) => x);
- // Build simplified breadcrumb: "uptime" or "uptime / details"
- const basePage = segments[0] || "home";
- const hasDetailsPage = segments.length > 1 && isId(segments[1]);
+ // Build simplified breadcrumb: "uptime" or "uptime / details" or "uptime / create"
+ const basePage = segments[0] || t("common.breadcrumbs.home");
+
+ const secondSegment = segments[1];
+ const isActionPage = secondSegment && actionSegments.includes(secondSegment); // create/config
+ const isDetailsPage = secondSegment && isId(secondSegment); // details
+ const hasSubPage = isActionPage || isDetailsPage;
+
+ const getSubPageLabel = (): string => {
+ if (isActionPage) {
+ return secondSegment.charAt(0).toUpperCase() + secondSegment.slice(1);
+ }
+ return t("common.breadcrumbs.details");
+ };
return (
{
},
}}
>
- {hasDetailsPage ? (
+ {hasSubPage ? (
{
{basePage.charAt(0).toUpperCase() + basePage.slice(1)}
)}
- {hasDetailsPage && (
+ {hasSubPage && (
{
color: theme.palette.primary.main,
}}
>
- Details
+ {getSubPageLabel()}
)}
diff --git a/client/src/Components/v2/design-elements/SplitBox.tsx b/client/src/Components/v2/design-elements/SplitBox.tsx
new file mode 100644
index 000000000..3a778dbcf
--- /dev/null
+++ b/client/src/Components/v2/design-elements/SplitBox.tsx
@@ -0,0 +1,78 @@
+import Stack from "@mui/material/Stack";
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
+import { useTheme } from "@mui/material/styles";
+import useMediaQuery from "@mui/material/useMediaQuery";
+export const SplitBox = ({
+ left,
+ right,
+}: {
+ left: React.ReactNode;
+ right: React.ReactNode;
+}) => {
+ const theme = useTheme();
+ const isSmall = useMediaQuery(theme.breakpoints.down("md"));
+ return (
+
+
+ {left}
+
+
+ {right}
+
+
+ );
+};
+
+export const ConfigBox = ({
+ title,
+ subtitle,
+ leftContent,
+ rightContent,
+}: {
+ title: string;
+ subtitle: string;
+ leftContent?: React.ReactNode;
+ rightContent: React.ReactNode;
+}) => {
+ const theme = useTheme();
+ return (
+
+
+ {title}
+
+ {subtitle}
+ {leftContent}
+
+ }
+ right={rightContent}
+ />
+ );
+};
diff --git a/client/src/Components/v2/design-elements/index.tsx b/client/src/Components/v2/design-elements/index.tsx
index 33248a345..a96fea052 100644
--- a/client/src/Components/v2/design-elements/index.tsx
+++ b/client/src/Components/v2/design-elements/index.tsx
@@ -17,3 +17,4 @@ export * from "./StatBox";
export * from "./BaseChart";
export * from "./Gauge";
export * from "./Tabs";
+export * from "./SplitBox";
diff --git a/client/src/Hooks/useNotificationForm.ts b/client/src/Hooks/useNotificationForm.ts
new file mode 100644
index 000000000..dd882db67
--- /dev/null
+++ b/client/src/Hooks/useNotificationForm.ts
@@ -0,0 +1,28 @@
+import { useMemo } from "react";
+import { notificationSchema } from "@/Validation/notifications";
+import type { Notification } from "@/Types/Notification";
+
+interface UseNotificationFormOptions {
+ data?: Notification | null;
+}
+
+export const useNotificationForm = ({ data = null }: UseNotificationFormOptions = {}) => {
+ return useMemo(() => {
+ const defaults =
+ data?.type === "matrix"
+ ? {
+ type: "matrix" as const,
+ notificationName: data.notificationName || "",
+ homeserverUrl: data.homeserverUrl || "",
+ roomId: data.roomId || "",
+ accessToken: data.accessToken || "",
+ }
+ : {
+ type: (data?.type || "email") as Exclude,
+ notificationName: data?.notificationName || "",
+ address: data?.address || "",
+ };
+
+ return { schema: notificationSchema, defaults };
+ }, [data]);
+};
diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index 6c5919fac..6cf84e45f 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -1,36 +1,7 @@
import { useState, useEffect, useCallback } from "react";
import { createToast } from "../Utils/toastUtils.jsx";
import { networkService } from "../main.jsx";
-import { useNavigate } from "react-router-dom";
import { useTranslation } from "react-i18next";
-import { NOTIFICATION_TYPES } from "../Pages/Notifications/utils.js";
-
-const useCreateNotification = () => {
- const navigate = useNavigate();
- const { t } = useTranslation();
- const [isLoading, setIsLoading] = useState(false);
- const [error, setError] = useState(null);
-
- const createNotification = async (notification) => {
- try {
- setIsLoading(true);
- await networkService.createNotification({ notification });
- createToast({
- body: t("notifications.create.success"),
- });
- navigate("/notifications");
- } catch (error) {
- setError(error);
- createToast({
- body: t("notifications.create.failed"),
- });
- } finally {
- setIsLoading(false);
- }
- };
-
- return [createNotification, isLoading, error];
-};
const useGetNotificationsByTeamId = (updateTrigger) => {
const [notifications, setNotifications] = useState([]);
@@ -60,119 +31,6 @@ const useGetNotificationsByTeamId = (updateTrigger) => {
return [notifications, isLoading, error];
};
-const useDeleteNotification = () => {
- const [isLoading, setIsLoading] = useState(false);
- const [error, setError] = useState(null);
- const { t } = useTranslation();
-
- const deleteNotification = async (id, callback) => {
- try {
- setIsLoading(true);
- await networkService.deleteNotificationById({ id });
- createToast({
- body: t("notifications.delete.success"),
- });
- if (callback) {
- callback();
- }
- } catch (error) {
- setError(error);
- createToast({
- body: t("notifications.delete.failed"),
- });
- } finally {
- setIsLoading(false);
- }
- };
-
- return [deleteNotification, isLoading, error];
-};
-
-const useGetNotificationById = (id, setNotification) => {
- const [isLoading, setIsLoading] = useState(false);
- const [error, setError] = useState(null);
-
- const getNotificationById = useCallback(async () => {
- try {
- setIsLoading(true);
- const response = await networkService.getNotificationById({ id });
-
- const notification = response?.data?.data ?? null;
-
- const notificationData = {
- address: notification?.address,
- notificationName: notification?.notificationName,
- type: NOTIFICATION_TYPES.find((type) => type.value === notification?.type)?.id,
- };
-
- setNotification(notificationData);
- } catch (error) {
- setError(error);
- } finally {
- setIsLoading(false);
- }
- }, [id, setNotification]);
-
- useEffect(() => {
- if (id) {
- getNotificationById();
- }
- }, [getNotificationById, id]);
-
- return [isLoading, error];
-};
-
-const useEditNotification = () => {
- const [isLoading, setIsLoading] = useState(false);
- const [error, setError] = useState(null);
- const { t } = useTranslation();
- const navigate = useNavigate();
- const editNotification = async (id, notification) => {
- try {
- setIsLoading(true);
- await networkService.editNotification({ id, notification });
- createToast({
- body: t("notifications.edit.success"),
- });
- navigate(`/notifications`);
- } catch (error) {
- setError(error);
- createToast({
- body: t("notifications.edit.failed"),
- });
- } finally {
- setIsLoading(false);
- }
- };
-
- return [editNotification, isLoading, error];
-};
-
-const useTestNotification = () => {
- const [isLoading, setIsLoading] = useState(false);
- const [error, setError] = useState(null);
- const { t } = useTranslation();
-
- const testNotification = async (notification) => {
- try {
- setIsLoading(true);
- await networkService.testNotification({ notification });
- createToast({
- body: t("notifications.test.success"),
- });
- } catch (error) {
- setError(error);
- createToast({
- body: error?.response?.data?.msg || t("notifications.test.failed"),
- });
- } finally {
- setIsLoading(false);
- }
- };
-
- return [testNotification, isLoading, error];
-};
-
const useTestAllNotifications = () => {
const [isLoading, setIsLoading] = useState(false);
const [error, setError] = useState(undefined);
@@ -197,12 +55,4 @@ const useTestAllNotifications = () => {
return [testAllNotifications, isLoading, error];
};
-export {
- useCreateNotification,
- useGetNotificationsByTeamId,
- useDeleteNotification,
- useGetNotificationById,
- useEditNotification,
- useTestNotification,
- useTestAllNotifications,
-};
+export { useGetNotificationsByTeamId, useTestAllNotifications };
diff --git a/client/src/Pages/Notifications/components/NotificationsTable.tsx b/client/src/Pages/Notifications/components/NotificationsTable.tsx
index 306d8efa8..2885a34bb 100644
--- a/client/src/Pages/Notifications/components/NotificationsTable.tsx
+++ b/client/src/Pages/Notifications/components/NotificationsTable.tsx
@@ -27,7 +27,7 @@ export const NotificationsTable = ({
id: 1,
label: t("pages.common.monitors.actions.configure"),
action: () => {
- navigate(`/notifications/${channel.id}`);
+ navigate(`/notifications/configure/${channel.id}`);
},
closeMenu: true,
},
@@ -89,7 +89,7 @@ export const NotificationsTable = ({
headers={headers}
data={notifications}
onRowClick={(row) => {
- navigate(`/notifications/${row.id}`);
+ navigate(`/notifications/configure/${row.id}`);
}}
/>
);
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
deleted file mode 100644
index 14b72ab61..000000000
--- a/client/src/Pages/Notifications/create/index.jsx
+++ /dev/null
@@ -1,320 +0,0 @@
-// Components
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import Breadcrumbs from "@/Components/v1/Breadcrumbs/index.jsx";
-import Button from "@mui/material/Button";
-import ConfigBox from "@/Components/v1/ConfigBox/index.jsx";
-import Box from "@mui/material/Box";
-import Select from "@/Components/v1/Inputs/Select/index.jsx";
-import TextInput from "@/Components/v1/Inputs/TextInput/index.jsx";
-import Dialog from "@/Components/v1/Dialog/index.jsx";
-
-// Utils
-import { useState } from "react";
-import { useTheme } from "@emotion/react";
-import {
- useCreateNotification,
- useGetNotificationById,
- useEditNotification,
- useTestNotification,
- useDeleteNotification,
-} from "../../../Hooks/useNotifications.js";
-import { notificationValidation } from "../../../Validation/validation.js";
-import { createToast } from "../../../Utils/toastUtils.jsx";
-import { useTranslation } from "react-i18next";
-import { useParams, useNavigate } from "react-router-dom";
-import {
- NOTIFICATION_TYPES,
- TITLE_MAP,
- DESCRIPTION_MAP,
- LABEL_MAP,
- PLACEHOLDER_MAP,
-} from "../utils.js";
-
-// Setup
-
-const CreateNotifications = () => {
- const { notificationId } = useParams();
- const navigate = useNavigate();
- const theme = useTheme();
- const [createNotification, isCreating] = useCreateNotification();
- const [editNotification, isEditing] = useEditNotification();
- const [testNotification, isTesting] = useTestNotification();
- const [deleteNotification, isDeleting] = useDeleteNotification();
-
- const BREADCRUMBS = [
- { name: "notifications", path: "/notifications" },
- {
- name: notificationId ? "edit" : "create",
- path: notificationId ? `/notifications/${notificationId}` : "/notifications/create",
- },
- ];
-
- // Redux state
-
- // local state
- const [notification, setNotification] = useState({
- notificationName: "",
- address: "",
- type: NOTIFICATION_TYPES[0].id,
- });
- const [errors, setErrors] = useState({});
- const { t } = useTranslation();
-
- const [notificationIsLoading] = useGetNotificationById(notificationId, setNotification);
-
- const [isOpen, setIsOpen] = useState(false);
-
- const getNotificationTypeValue = (typeId) => {
- return NOTIFICATION_TYPES.find((type) => type.id === typeId)?.value || "email";
- };
-
- const extractError = (error, field) =>
- error?.details.find((d) => d.path.includes(field))?.message;
-
- // handlers
- const onSubmit = (e) => {
- e.preventDefault();
- const form = {
- ...notification,
- type: getNotificationTypeValue(notification.type),
- };
-
- let error = null;
-
- error = notificationValidation.validate(form, { abortEarly: false }).error;
-
- if (error) {
- const newErrors = {};
- error.details.forEach((err) => {
- newErrors[err.path[0]] = err.message;
- });
- createToast({ body: Object.values(newErrors)[0] });
- setErrors(newErrors);
- return;
- }
-
- if (notificationId) {
- editNotification(notificationId, form);
- } else {
- createNotification(form);
- }
- };
-
- const onChange = (e) => {
- const { name, value } = e.target;
- let rawNotification = { ...notification, [name]: value };
- let newNotification = {
- ...rawNotification,
- type: getNotificationTypeValue(rawNotification.type),
- };
-
- const { error } = notificationValidation.validate(newNotification, {
- abortEarly: false,
- });
- let validationError = { ...errors };
-
- if (name === "type") {
- validationError["type"] = extractError(error, "type");
- validationError["address"] = extractError(error, "address");
- } else {
- validationError[name] = extractError(error, name);
- }
-
- setNotification(rawNotification);
- setErrors(validationError);
- };
-
- const onTestNotification = () => {
- const form = {
- ...notification,
- type: getNotificationTypeValue(notification.type),
- };
-
- let error = null;
-
- error = notificationValidation.validate(form, { abortEarly: false }).error;
-
- if (error) {
- const newErrors = {};
- error.details.forEach((err) => {
- newErrors[err.path[0]] = err.message;
- });
- createToast({ body: Object.values(newErrors)[0] });
- setErrors(newErrors);
- return;
- }
-
- testNotification(form);
- };
-
- const onDelete = () => {
- if (notificationId) {
- deleteNotification(notificationId, () => navigate("/notifications"));
- }
- };
-
- const type = getNotificationTypeValue(notification.type);
- return (
-
-
- {t("createNotifications.title")}
-
-
-
-
- {t("createNotifications.nameSettings.title")}
-
-
- {t("createNotifications.nameSettings.description")}
-
-
-
-
-
-
-
-
-
- {t("createNotifications.typeSettings.title")}
-
-
- {t("createNotifications.typeSettings.description")}
-
-
-
-
-
-
-
-
-
- {t(TITLE_MAP[type])}
-
- {t(DESCRIPTION_MAP[type])}
-
-
- {type === "matrix" ? (
- <>
-
-
-
- >
- ) : (
-
- )}
-
- {" "}
-
-
- {notificationId && (
-
- )}
-
-
-
-
- );
-};
-
-export default CreateNotifications;
diff --git a/client/src/Pages/Notifications/create/index.tsx b/client/src/Pages/Notifications/create/index.tsx
new file mode 100644
index 000000000..30cfd4c80
--- /dev/null
+++ b/client/src/Pages/Notifications/create/index.tsx
@@ -0,0 +1,260 @@
+import { BasePage, ConfigBox } from "@/Components/v2/design-elements";
+import { TextField, Select, Button } from "@/Components/v2/inputs";
+import MenuItem from "@mui/material/MenuItem";
+import Typography from "@mui/material/Typography";
+import Stack from "@mui/material/Stack";
+import { useTheme } from "@mui/material/styles";
+
+import { useEffect, useMemo } from "react";
+import { useParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
+import { Controller, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useGet, usePost, usePatch } from "@/Hooks/UseApi";
+import { useNotificationForm } from "@/Hooks/useNotificationForm";
+import type { NotificationFormData } from "@/Validation/notifications";
+import type { Notification } from "@/Types/Notification";
+import { useTranslation } from "react-i18next";
+import { NotificationChannels } from "@/Types/Notification";
+
+const NotificationsCreatePage = () => {
+ const { t } = useTranslation();
+ const theme = useTheme();
+ const navigate = useNavigate();
+ const { notificationId } = useParams<{ notificationId: string }>();
+ const isEditMode = Boolean(notificationId);
+
+ const { data: existingNotification } = useGet(
+ isEditMode ? `/notifications/${notificationId}` : null
+ );
+
+ const { post, loading: isSubmitting } = usePost();
+ const { patch, loading: isPatching } = usePatch();
+ const { post: testPost, loading: isTesting } = usePost();
+
+ const { schema, defaults } = useNotificationForm({ data: existingNotification });
+
+ const form = useForm({
+ resolver: zodResolver(schema),
+ defaultValues: defaults,
+ });
+
+ const { control, watch, reset, handleSubmit, clearErrors, trigger, getValues } = form;
+
+ useEffect(() => {
+ reset(defaults);
+ }, [defaults, reset]);
+
+ const watchedType = watch("type");
+
+ useEffect(() => {
+ clearErrors();
+ }, [watchedType, clearErrors]);
+
+ const addressConfig = useMemo(() => {
+ if (watchedType === "pager_duty") {
+ return {
+ title: t("pages.notifications.form.pagerDuty.title"),
+ description: t("pages.notifications.form.pagerDuty.description"),
+ fieldLabel: t("pages.notifications.form.pagerDuty.optionIntegrationKey"),
+ placeholder: t("pages.notifications.form.pagerDuty.placeholder"),
+ };
+ }
+ if (watchedType === "email") {
+ return {
+ title: t("pages.notifications.form.address.title"),
+ description: t("pages.notifications.form.address.description"),
+ fieldLabel: t("pages.notifications.form.address.optionAddress"),
+ placeholder: t("pages.notifications.form.address.placeholderEmail"),
+ };
+ }
+ return {
+ title: t("pages.notifications.form.address.title"),
+ description: t("pages.notifications.form.address.description"),
+ fieldLabel: t("pages.notifications.form.address.optionAddress"),
+ placeholder: t("pages.notifications.form.address.placeholderWebhook"),
+ };
+ }, [watchedType, t]);
+
+ const onSubmit = async (data: NotificationFormData) => {
+ const result = isEditMode
+ ? await patch(`/notifications/${notificationId}`, data)
+ : await post("/notifications", data);
+ if (result) {
+ navigate("/notifications");
+ }
+ };
+
+ const handleTest = async () => {
+ const isValid = await trigger();
+ if (!isValid) return;
+ const data = getValues();
+ await testPost("/notifications/test", data);
+ };
+
+ return (
+
+ (
+
+ )}
+ />
+ }
+ />
+ (
+
+ )}
+ />
+ }
+ />
+ {watchedType !== "matrix" && (
+ (
+
+ )}
+ />
+ }
+ />
+ )}
+ {watchedType === "matrix" && (
+
+ (
+
+ )}
+ />
+ (
+
+ )}
+ />
+ (
+
+ )}
+ />
+
+ }
+ />
+ )}
+
+
+
+
+
+ );
+};
+
+export default NotificationsCreatePage;
diff --git a/client/src/Pages/Notifications/utils.js b/client/src/Pages/Notifications/utils.js
deleted file mode 100644
index 9ad422101..000000000
--- a/client/src/Pages/Notifications/utils.js
+++ /dev/null
@@ -1,44 +0,0 @@
-export const NOTIFICATION_TYPES = [
- { id: 1, name: "E-mail", value: "email" },
- { id: 2, name: "Slack", value: "slack" },
- { id: 3, name: "PagerDuty", value: "pager_duty" },
- { id: 4, name: "Webhook", value: "webhook" },
- { id: 5, name: "Discord", value: "discord" },
- { id: 6, name: "Matrix", value: "matrix" },
-];
-
-export const TITLE_MAP = {
- email: "createNotifications.emailSettings.title",
- slack: "createNotifications.slackSettings.title",
- pager_duty: "createNotifications.pagerdutySettings.title",
- webhook: "createNotifications.webhookSettings.title",
- discord: "createNotifications.discordSettings.title",
- matrix: "createNotifications.matrixSettings.title",
-};
-
-export const DESCRIPTION_MAP = {
- email: "createNotifications.emailSettings.description",
- slack: "createNotifications.slackSettings.description",
- pager_duty: "createNotifications.pagerdutySettings.description",
- webhook: "createNotifications.webhookSettings.description",
- discord: "createNotifications.discordSettings.description",
- matrix: "createNotifications.matrixSettings.description",
-};
-
-export const LABEL_MAP = {
- email: "createNotifications.emailSettings.emailLabel",
- slack: "createNotifications.slackSettings.webhookLabel",
- pager_duty: "createNotifications.pagerdutySettings.integrationKeyLabel",
- webhook: "createNotifications.webhookSettings.webhookLabel",
- discord: "createNotifications.discordSettings.webhookLabel",
- matrix: "createNotifications.matrixSettings.homeserverLabel",
-};
-
-export const PLACEHOLDER_MAP = {
- email: "createNotifications.emailSettings.emailPlaceholder",
- slack: "createNotifications.slackSettings.webhookPlaceholder",
- pager_duty: "createNotifications.pagerdutySettings.integrationKeyPlaceholder",
- webhook: "createNotifications.webhookSettings.webhookPlaceholder",
- discord: "createNotifications.discordSettings.webhookPlaceholder",
- matrix: "createNotifications.matrixSettings.homeserverPlaceholder",
-};
diff --git a/client/src/Routes/index.jsx b/client/src/Routes/index.jsx
index e0725e8e2..498be4ba7 100644
--- a/client/src/Routes/index.jsx
+++ b/client/src/Routes/index.jsx
@@ -44,7 +44,7 @@ import StatusPages from "../Pages/StatusPage/StatusPages/index.jsx";
import Status from "../Pages/StatusPage/Status/index.jsx";
import Notifications from "../Pages/Notifications";
-import CreateNotifications from "../Pages/Notifications/create/index.jsx";
+import CreateNotifications from "../Pages/Notifications/create";
// Settings
import Account from "../Pages/Account/index.jsx";
@@ -220,12 +220,24 @@ const Routes = () => {
/>
}
+ element={
+ <>
+
+
+
+ >
+ }
/>
}
+ path="notifications/configure/:notificationId"
+ element={
+ <>
+
+
+
+ >
+ }
/>
;
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 960397021..80da1835c 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -2,6 +2,10 @@
"common": {
"appName": "Checkmate",
"monitoringAgentName": "Capture",
+ "breadcrumbs": {
+ "home": "Home",
+ "details": "Details"
+ },
"labels": {
"responseTime": "Response time"
},
@@ -14,7 +18,9 @@
"resume": "Resume",
"delete": "Delete",
"cancel": "Cancel",
- "confirm": "Confirm"
+ "confirm": "Confirm",
+ "save": "Save",
+ "test": "Test"
},
"alerts": {
"pageSpeedApiKey": {
@@ -269,10 +275,11 @@
"si": "Speed Index (SI)",
"tbt": "Total Blocking Time (TBT)"
},
- "pie": { "title": "Performance report" },
+ "pie": {
+ "title": "Performance report"
+ },
"legend": {
"title": "PageSpeed report",
-
"weight": "Weight"
}
}
@@ -342,6 +349,50 @@
"headers": {
"destination": "Destination"
}
+ },
+ "form": {
+ "notificationName": {
+ "description": "A descriptive name for the notification channel",
+ "optionName": "Channel name",
+ "placeholder": "e.g. Production Alerts",
+ "title": "Channel name"
+ },
+ "type": {
+ "description": "Select the type of notification channel to create.",
+ "optionType": "Type",
+ "title": "Channel type"
+ },
+ "homeServer": {
+ "description": "Select the home server for this notification channel.",
+ "optionHomeServer": "Home server",
+ "placeholder": "example.com",
+ "title": "Home server"
+ },
+ "roomId": {
+ "optionRoomId": "Room ID",
+ "placeholder": "!abcdefg:matrix.org"
+ },
+ "accessToken": {
+ "optionAccessToken": "Access token",
+ "placeholder": "syt_YWxleF9ob2xsaWRheQ_VmtScmV0U2VjcmV0S2V5_abc123"
+ },
+ "address": {
+ "description": "The address where notifications will be sent.",
+ "optionAddress": "Address",
+ "placeholderEmail": "example@example.com",
+ "placeholderWebhook": "https://your-server.com/webhook",
+ "title": "Address"
+ },
+ "pagerDuty": {
+ "description": "Your PagerDuty integration key for receiving alerts.",
+ "optionIntegrationKey": "Integration key",
+ "placeholder": "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6",
+ "title": "Integration key"
+ },
+ "matrix": {
+ "description": "Configure your Matrix homeserver connection for notifications.",
+ "title": "Matrix configuration"
+ }
}
}
},
diff --git a/server/src/routes/notificationRoute.ts b/server/src/routes/notificationRoute.ts
index 7fe4bf5cb..a1802d3b9 100755
--- a/server/src/routes/notificationRoute.ts
+++ b/server/src/routes/notificationRoute.ts
@@ -19,7 +19,7 @@ class NotificationRoutes {
this.router.get("/:id", this.notificationController.getNotificationById);
this.router.delete("/:id", this.notificationController.deleteNotification);
- this.router.put("/:id", this.notificationController.editNotification);
+ this.router.patch("/:id", this.notificationController.editNotification);
}
getRouter() {