From 9b76bd566a8d4a6388e8c2f1f16aad01dd7f9c0b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 9 Dec 2024 13:35:00 +0800 Subject: [PATCH 1/9] Update monitor and infrastrucutre validation to allow for port numbers --- Client/src/Validation/validation.js | 44 +++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js index 52ed3aa10..a7d6b3eb6 100644 --- a/Client/src/Validation/validation.js +++ b/Client/src/Validation/validation.js @@ -91,10 +91,24 @@ const credentials = joi.object({ }); const monitorValidation = joi.object({ - url: joi.string().uri({ allowRelative: true }).trim().messages({ - "string.empty": "This field is required.", - "string.uri": "The URL you provided is not valid.", - }), + url: joi + .string() + .trim() + .custom((value, helpers) => { + const urlRegex = + /^(https?:\/\/)?(([0-9]{1,3}\.){3}[0-9]{1,3}|[\da-z\.-]+)(\.[a-z\.]{2,6})?(:(\d+))?([\/\w \.-]*)*\/?$/i; + + if (!urlRegex.test(value)) { + return helpers.error("string.invalidUrl"); + } + + return value; + }) + .messages({ + "string.empty": "This field is required.", + "string.uri": "The URL you provided is not valid.", + "string.invalidUrl": "Please enter a valid URL with optional port", + }), name: joi.string().trim().max(50).allow("").messages({ "string.max": "This field should not exceed the 50 characters limit.", }), @@ -176,10 +190,24 @@ const advancedSettingsValidation = joi.object({ }); const infrastructureMonitorValidation = joi.object({ - url: joi.string().uri({ allowRelative: true }).trim().messages({ - "string.empty": "This field is required.", - "string.uri": "The URL you provided is not valid.", - }), + url: joi + .string() + .trim() + .custom((value, helpers) => { + const urlRegex = + /^(https?:\/\/)?(([0-9]{1,3}\.){3}[0-9]{1,3}|[\da-z\.-]+)(\.[a-z\.]{2,6})?(:(\d+))?([\/\w \.-]*)*\/?$/i; + + if (!urlRegex.test(value)) { + return helpers.error("string.invalidUrl"); + } + + return value; + }) + .messages({ + "string.empty": "This field is required.", + "string.uri": "The URL you provided is not valid.", + "string.invalidUrl": "Please enter a valid URL with optional port", + }), name: joi.string().trim().max(50).allow("").messages({ "string.max": "This field should not exceed the 50 characters limit.", }), From dd487c714f2941e53ff41530c41a6a4787a1f825 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 9 Dec 2024 13:35:21 +0800 Subject: [PATCH 2/9] simplify custom threshold --- .../CreateMonitor/CustomThreshold/index.jsx | 60 +++++++++++++------ 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx b/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx index c7b9f0c76..1c6782404 100644 --- a/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx +++ b/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx @@ -5,32 +5,52 @@ import { useTheme } from "@emotion/react"; import PropTypes from "prop-types"; /** - * `CustomThreshold` is a functional React component that displays a - * group of CheckBox with a label and its correspondant threshold input field. + * CustomThreshold Component * - * @param {{ checkboxId: any; checkboxLabel: any; onCheckboxChange: any; fieldId: any; onFieldChange: any; onFieldBlur: any; alertUnit: any; infrastructureMonitor: any; errors: any; }} param0 - * @param {string} param0.checkboxId - The text is the id of the checkbox. - * @param {string} param0.checkboxLabel - The text to be displayed as the label next to the check icon. - * @param {func} param0.onCheckboxChange - The function to invoke when checkbox is checked or unchecked. - * @param {string} param0.fieldId - The text is the id of the input field. - * @param {func} param0.onFieldChange - The function to invoke when input field is changed. - * @param {func} param0.onFieldBlur - The function to invoke when input field is losing focus. - * @param {string} param0.alertUnit the threshold unit such as usage percentage '%' etc - * @param {object} param0.infrastructureMonitor the form object of the create infrastrcuture monitor page - * @param {object} param0.errors the object that holds all the errors of the form page - * @returns A compound React component that renders the custom threshold alert section + * A reusable component that renders a checkbox with an associated numeric input field + * and an optional unit label. The input field can be enabled/disabled based on checkbox state. * + * @component + * @param {Object} props - Component properties + * @param {string} [props.checkboxId] - Optional unique identifier for the checkbox + * @param {string} props.checkboxLabel - Label text for the checkbox + * @param {boolean} props.isChecked - Current checked state of the checkbox + * @param {Function} props.onCheckboxChange - Callback function when checkbox is toggled + * @param {string} props.fieldId - Unique identifier for the input field + * @param {string} props.fieldValue - Current value of the input field + * @param {Function} props.onFieldChange - Callback function when input field value changes + * @param {Function} props.onFieldBlur - Callback function when input field loses focus + * @param {string} props.alertUnit - Unit label displayed next to the input field + * @param {Object} props.errors - Object containing validation errors + * @param {Object} props.infrastructureMonitor - Infrastructure monitor configuration object + * + * @returns {React.ReactElement} Rendered CustomThreshold component + * + * @example + * */ - export const CustomThreshold = ({ checkboxId, checkboxLabel, onCheckboxChange, + isChecked, fieldId, + fieldValue, onFieldChange, onFieldBlur, alertUnit, - infrastructureMonitor, errors, }) => { const theme = useTheme(); @@ -47,7 +67,7 @@ export const CustomThreshold = ({ @@ -61,11 +81,11 @@ export const CustomThreshold = ({ maxWidth="var(--env-var-width-4)" type="number" id={fieldId} - value={infrastructureMonitor[fieldId]} + value={fieldValue} onBlur={onFieldBlur} onChange={onFieldChange} error={errors[fieldId] ? true : false} - disabled={!infrastructureMonitor[checkboxId]} + disabled={!isChecked} /> Date: Mon, 9 Dec 2024 13:35:48 +0800 Subject: [PATCH 3/9] refactor create infrastructure --- .../Infrastructure/CreateMonitor/index.jsx | 458 ++++++++++-------- 1 file changed, 243 insertions(+), 215 deletions(-) diff --git a/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx b/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx index f1d2d0ce2..eeeca1ad6 100644 --- a/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx +++ b/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx @@ -1,27 +1,66 @@ +// React, Redux, Router +import { useTheme } from "@emotion/react"; +import { useNavigate, useParams } from "react-router-dom"; +import { useEffect } from "react"; import { useState } from "react"; -import { Box, Stack, Typography } from "@mui/material"; -import LoadingButton from "@mui/lab/LoadingButton"; import { useSelector, useDispatch } from "react-redux"; + +// Utility and Network import { infrastructureMonitorValidation } from "../../../Validation/validation"; -import { parseDomainName } from "../../../Utils/monitorUtils"; import { createInfrastructureMonitor, checkInfrastructureEndpointResolution, } from "../../../Features/InfrastructureMonitors/infrastructureMonitorsSlice"; -import { useNavigate } from "react-router-dom"; -import { useTheme } from "@emotion/react"; -import { createToast } from "../../../Utils/toastUtils"; +import { capitalizeFirstLetter } from "../../../Utils/stringUtils"; + +// MUI +import { Box, Stack, Typography, Button, ButtonGroup } from "@mui/material"; +import LoadingButton from "@mui/lab/LoadingButton"; + +//Components +import Breadcrumbs from "../../../Components/Breadcrumbs"; import Link from "../../../Components/Link"; import { ConfigBox } from "../../Monitors/styled"; import TextInput from "../../../Components/Inputs/TextInput"; -import Select from "../../../Components/Inputs/Select"; +import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments"; +import { createToast } from "../../../Utils/toastUtils"; import Checkbox from "../../../Components/Inputs/Checkbox"; -import Breadcrumbs from "../../../Components/Breadcrumbs"; -import { buildErrors, hasValidationErrors } from "../../../Validation/error"; -import { capitalizeFirstLetter } from "../../../Utils/stringUtils"; -import { CustomThreshold } from "../CreateMonitor/CustomThreshold"; +import Select from "../../../Components/Inputs/Select"; +import { CustomThreshold } from "./CustomThreshold"; + +const SELECT_VALUES = [ + { _id: 0.25, name: "15 seconds" }, + { _id: 0.5, name: "30 seconds" }, + { _id: 1, name: "1 minute" }, + { _id: 2, name: "2 minutes" }, + { _id: 5, name: "5 minutes" }, + { _id: 10, name: "10 minutes" }, +]; + +const METRICS = ["cpu", "memory", "disk", "temperature"]; +const METRIC_PREFIX = "usage_"; +const MS_PER_MINUTE = 60000; + +const hasAlertError = (errors) => { + return Object.keys(errors).filter((k) => k.startsWith(METRIC_PREFIX)).length > 0; +}; + +const getAlertError = (errors) => { + return Object.keys(errors).find((key) => key.startsWith(METRIC_PREFIX)) + ? errors[Object.keys(errors).find((key) => key.startsWith(METRIC_PREFIX))] + : null; +}; const CreateInfrastructureMonitor = () => { + const theme = useTheme(); + const { user, authToken } = useSelector((state) => state.auth); + const monitorState = useSelector((state) => state.infrastructureMonitor); + const dispatch = useDispatch(); + const navigate = useNavigate(); + + // State + const [errors, setErrors] = useState({}); + const [https, setHttps] = useState(false); const [infrastructureMonitor, setInfrastructureMonitor] = useState({ url: "", name: "", @@ -38,118 +77,73 @@ const CreateInfrastructureMonitor = () => { secret: "", }); - const MS_PER_MINUTE = 60000; - const THRESHOLD_FIELD_PREFIX = "usage_"; - const HARDWARE_MONITOR_TYPES = ["cpu", "memory", "disk", "temperature"]; - const { user, authToken } = useSelector((state) => state.auth); - const monitorState = useSelector((state) => state.infrastructureMonitor); - const dispatch = useDispatch(); - const navigate = useNavigate(); - const theme = useTheme(); - - const idMap = { - "notify-email-default": "notification-email", - }; - - const [errors, setErrors] = useState({}); - - const alertErrKeyLen = Object.keys(errors).filter((k) => - k.startsWith(THRESHOLD_FIELD_PREFIX) - ).length; - - const handleCustomAlertCheckChange = (event) => { - const { value, id } = event.target; - setInfrastructureMonitor((prev) => { - const newState = { - [id]: prev[id] == undefined && value == "on" ? true : !prev[id], - }; - return { - ...prev, - ...newState, - [THRESHOLD_FIELD_PREFIX + id]: newState[id] - ? prev[THRESHOLD_FIELD_PREFIX + id] - : "", - }; - }); - // Remove the error if unchecked - setErrors((prev) => { - return buildErrors(prev, [THRESHOLD_FIELD_PREFIX + id]); - }); - }; - - const handleBlur = (event, appendID) => { + // Handlers + const handleCreateInfrastructureMonitor = async (event) => { event.preventDefault(); - const { value, id } = event.target; - let name = idMap[id] ?? id; - if (name === "url" && infrastructureMonitor.name === "") { - setInfrastructureMonitor((prev) => ({ - ...prev, - name: parseDomainName(value), - })); + // Build the form + let form = { + url: `http${https ? "s" : ""}://` + infrastructureMonitor.url, + name: + infrastructureMonitor.name === "" + ? infrastructureMonitor.url + : infrastructureMonitor.name, + interval: infrastructureMonitor.interval * MS_PER_MINUTE, + cpu: infrastructureMonitor.cpu, + ...(infrastructureMonitor.cpu + ? { usage_cpu: infrastructureMonitor.usage_cpu } + : {}), + memory: infrastructureMonitor.memory, + ...(infrastructureMonitor.memory + ? { usage_memory: infrastructureMonitor.usage_memory } + : {}), + disk: infrastructureMonitor.disk, + ...(infrastructureMonitor.disk + ? { usage_disk: infrastructureMonitor.usage_disk } + : {}), + temperature: infrastructureMonitor.temperature, + ...(infrastructureMonitor.temperature + ? { usage_temperature: infrastructureMonitor.usage_temperature } + : {}), + secret: infrastructureMonitor.secret, + }; + + const { error } = infrastructureMonitorValidation.validate(form, { + abortEarly: false, + }); + + if (error) { + const newErrors = {}; + error.details.forEach((err) => { + newErrors[err.path[0]] = err.message; + }); + setErrors(newErrors); + createToast({ body: "Please check the form for errors." }); + return; } - if (id?.startsWith("notify-email-")) return; - const { error } = infrastructureMonitorValidation.validate( - { [id ?? appendID]: value }, - { - abortEarly: false, - } - ); - setErrors((prev) => { - return buildErrors(prev, id ?? appendID, error); - }); - }; + // Build the thresholds for the form + const { + cpu, + usage_cpu, + memory, + usage_memory, + disk, + usage_disk, + temperature, + usage_temperature, + ...rest + } = form; - const handleChange = (event, appendedId) => { - event.preventDefault(); - const { value, id } = event.target; - let name = appendedId ?? idMap[id] ?? id; - if (name.includes("notification-")) { - name = name.replace("notification-", ""); - let hasNotif = infrastructureMonitor.notifications.some( - (notification) => notification.type === name - ); - setInfrastructureMonitor((prev) => { - const notifs = [...prev.notifications]; - if (hasNotif) { - return { - ...prev, - notifications: notifs.filter((notif) => notif.type !== name), - }; - } else { - return { - ...prev, - notifications: [ - ...notifs, - name === "email" - ? { type: name, address: value } - : // TODO - phone number - { type: name, phone: value }, - ], - }; - } - }); - } else { - setInfrastructureMonitor((prev) => ({ - ...prev, - [name]: value, - })); - } - }; - - const generatePayload = (form) => { - let thresholds = {}; - Object.keys(form) - .filter((k) => k.startsWith(THRESHOLD_FIELD_PREFIX)) - .map((k) => { - if (form[k]) thresholds[k] = form[k] / 100; - delete form[k]; - delete form[k.substring(THRESHOLD_FIELD_PREFIX.length)]; - }); + const thresholds = { + ...(cpu ? { usage_cpu: usage_cpu / 100 } : {}), + ...(memory ? { usage_memory: usage_memory / 100 } : {}), + ...(disk ? { usage_disk: usage_disk / 100 } : {}), + ...(temperature ? { usage_temperature: usage_temperature / 100 } : {}), + }; form = { - ...form, + ...rest, description: form.name, teamId: user.teamId, userId: user._id, @@ -157,54 +151,75 @@ const CreateInfrastructureMonitor = () => { notifications: infrastructureMonitor.notifications, thresholds, }; - return form; - }; - const handleCreateInfrastructureMonitor = async (event) => { - event.preventDefault(); - let form = { - ...infrastructureMonitor, - name: - infrastructureMonitor.name === "" - ? infrastructureMonitor.url - : infrastructureMonitor.name, - interval: infrastructureMonitor.interval * MS_PER_MINUTE, - }; - delete form.notifications; - if (hasValidationErrors(form, infrastructureMonitorValidation, setErrors)) { - return; + console.log(form); + + const action = await dispatch( + createInfrastructureMonitor({ authToken, monitor: form }) + ); + if (action.meta.requestStatus === "fulfilled") { + createToast({ body: "Infrastructure monitor created successfully!" }); + navigate("/infrastructure"); } else { - const checkEndpointAction = await dispatch( - checkInfrastructureEndpointResolution({ authToken, monitorURL: form.url }) - ); - if (checkEndpointAction.meta.requestStatus === "rejected") { - createToast({ - body: "The endpoint you entered doesn't resolve. Check the URL again.", - }); - setErrors({ url: "The entered URL is not reachable." }); - return; - } - const action = await dispatch( - createInfrastructureMonitor({ authToken, monitor: generatePayload(form) }) - ); - if (action.meta.requestStatus === "fulfilled") { - createToast({ body: "Infrastructure monitor created successfully!" }); - navigate("/infrastructure"); - } else { - createToast({ body: "Failed to create monitor." }); - } + createToast({ body: "Failed to create monitor." }); } }; - //select values - const frequencies = [ - { _id: 0.25, name: "15 seconds" }, - { _id: 0.5, name: "30 seconds" }, - { _id: 1, name: "1 minute" }, - { _id: 2, name: "2 minutes" }, - { _id: 5, name: "5 minutes" }, - { _id: 10, name: "10 minutes" }, - ]; + const handleChange = (event, formName) => { + const { value } = event.target; + setInfrastructureMonitor({ + ...infrastructureMonitor, + [formName]: value, + }); + + const { error } = infrastructureMonitorValidation.validate( + { [formName]: value }, + { abortEarly: false } + ); + setErrors((prev) => ({ + ...prev, + ...(error ? { [formName]: error.details[0].message } : { [formName]: undefined }), + })); + }; + + const handleCheckboxChange = (event, formName) => { + console.log(event.target.checked, formName); + const { checked } = event.target; + setInfrastructureMonitor({ + ...infrastructureMonitor, + [formName]: checked, + }); + }; + + const handleBlur = (event) => { + console.log("hanldeBlur", event); + }; + + const handleNotifications = (event, type) => { + const { value } = event.target; + let notifications = [...infrastructureMonitor.notifications]; + const notificationExists = notifications.some((notification) => { + if (notification.type === type && notification.address === value) { + return true; + } + return false; + }); + if (notificationExists) { + notifications = notifications.filter((notification) => { + if (notification.type === type && notification.address === value) { + return false; + } + return true; + }); + } else { + notifications.push({ type, address: value }); + } + + setInfrastructureMonitor((prev) => ({ + ...prev, + notifications, + })); + }; return ( @@ -239,39 +254,57 @@ const CreateInfrastructureMonitor = () => { fontSize="inherit" fontWeight="inherit" > - infrastructure monitor + monitor - - - General settings - - Here you can select the URL of the host, together with the friendly name - and authorization secret to connect to the server agent. - - - The server you are monitoring must be running the{" "} - - - - + + General settings + + Here you can select the URL of the host, together with the friendly name and + authorization secret to connect to the server agent. + + + The server you are monitoring must be running the{" "} + + + } + placeholder={"localhost:59232/api/v1/metrics"} label="Server URL" - placeholder="https://" + https={https} value={infrastructureMonitor.url} - onBlur={handleBlur} - onChange={handleChange} + onChange={(event) => handleChange(event, "url")} error={errors["url"] ? true : false} helperText={errors["url"]} /> + + Protocol + + + + + { placeholder="Google" isOptional={true} value={infrastructureMonitor.name} - onBlur={handleBlur} - onChange={handleChange} + onChange={(event) => handleChange(event, "name")} error={errors["name"]} /> { id="secret" label="Authorization secret" value={infrastructureMonitor.secret} - onBlur={handleBlur} - onChange={handleChange} + onChange={(event) => handleChange(event, "secret")} error={errors["secret"] ? true : false} helperText={errors["secret"]} /> @@ -311,12 +342,11 @@ const CreateInfrastructureMonitor = () => { (notification) => notification.type === "email" )} value={user?.email} - onChange={(e) => handleChange(e)} + onChange={(event) => handleNotifications(event, "email")} onBlur={handleBlur} /> - Customize alerts @@ -326,25 +356,30 @@ const CreateInfrastructureMonitor = () => { - {HARDWARE_MONITOR_TYPES.map((type, idx) => ( - - ))} - {alertErrKeyLen > 0 && ( + {METRICS.map((metric) => { + return ( + handleCheckboxChange(event, metric)} + isChecked={infrastructureMonitor[metric]} + fieldId={METRIC_PREFIX + metric} + fieldValue={infrastructureMonitor[METRIC_PREFIX + metric]} + onFieldChange={(event) => handleChange(event, METRIC_PREFIX + metric)} + onFieldBlur={(event) => handleBlur(event, METRIC_PREFIX + metric)} + alertUnit={metric == "temperature" ? "°C" : "%"} + /> + ); + })} + {/* Error text */} + {hasAlertError(errors) && ( { opacity: 0.8, }} > - { - errors[ - THRESHOLD_FIELD_PREFIX + - HARDWARE_MONITOR_TYPES.filter( - (type) => errors[THRESHOLD_FIELD_PREFIX + type] - )[0] - ] - } + {getAlertError(errors)} )} @@ -377,7 +405,7 @@ const CreateInfrastructureMonitor = () => { value={infrastructureMonitor.interval || 15} onChange={(e) => handleChange(e, "interval")} onBlur={(e) => handleBlur(e, "interval")} - items={frequencies} + items={SELECT_VALUES} /> From de149503ae2154517f5c960d72613be3e72f4cde Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 10 Dec 2024 11:29:57 +0800 Subject: [PATCH 4/9] Expose name prop in Checkbox component --- Client/src/Components/Inputs/Checkbox/index.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Client/src/Components/Inputs/Checkbox/index.jsx b/Client/src/Components/Inputs/Checkbox/index.jsx index 2f89d86df..3d10914c6 100644 --- a/Client/src/Components/Inputs/Checkbox/index.jsx +++ b/Client/src/Components/Inputs/Checkbox/index.jsx @@ -30,6 +30,7 @@ import "./index.css"; const Checkbox = ({ id, + name, label, size = "medium", isChecked, @@ -46,6 +47,7 @@ const Checkbox = ({ control={ } @@ -54,7 +56,7 @@ const Checkbox = ({ "aria-label": "controlled checkbox", id: id, }} - sx={{ + sx={{ "&:hover": { backgroundColor: "transparent" }, "& svg": { width: sizes[size], height: sizes[size] }, alignSelf: "flex-start", @@ -89,6 +91,7 @@ const Checkbox = ({ Checkbox.propTypes = { id: PropTypes.string.isRequired, + name: PropTypes.string, label: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired, size: PropTypes.oneOf(["small", "medium", "large"]), isChecked: PropTypes.bool.isRequired, From f64e4d04ef9aade7938d3415eb90f60c63a6d04b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 10 Dec 2024 11:30:25 +0800 Subject: [PATCH 5/9] Add checkbox name and fieldname props to CustomThreshold --- .../Infrastructure/CreateMonitor/CustomThreshold/index.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx b/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx index 1c6782404..e87d46de3 100644 --- a/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx +++ b/Client/src/Pages/Infrastructure/CreateMonitor/CustomThreshold/index.jsx @@ -43,10 +43,12 @@ import PropTypes from "prop-types"; */ export const CustomThreshold = ({ checkboxId, + checkboxName, checkboxLabel, onCheckboxChange, isChecked, fieldId, + fieldName, fieldValue, onFieldChange, onFieldBlur, @@ -66,6 +68,7 @@ export const CustomThreshold = ({ Date: Tue, 10 Dec 2024 11:30:38 +0800 Subject: [PATCH 6/9] Use name instead of extra param --- .../Infrastructure/CreateMonitor/index.jsx | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx b/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx index eeeca1ad6..ff05b9ef2 100644 --- a/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx +++ b/Client/src/Pages/Infrastructure/CreateMonitor/index.jsx @@ -1,16 +1,12 @@ // React, Redux, Router import { useTheme } from "@emotion/react"; -import { useNavigate, useParams } from "react-router-dom"; -import { useEffect } from "react"; +import { useNavigate } from "react-router-dom"; import { useState } from "react"; import { useSelector, useDispatch } from "react-redux"; // Utility and Network import { infrastructureMonitorValidation } from "../../../Validation/validation"; -import { - createInfrastructureMonitor, - checkInfrastructureEndpointResolution, -} from "../../../Features/InfrastructureMonitors/infrastructureMonitorsSlice"; +import { createInfrastructureMonitor } from "../../../Features/InfrastructureMonitors/infrastructureMonitorsSlice"; import { capitalizeFirstLetter } from "../../../Utils/stringUtils"; // MUI @@ -165,34 +161,34 @@ const CreateInfrastructureMonitor = () => { } }; - const handleChange = (event, formName) => { - const { value } = event.target; + const handleChange = (event) => { + const { value, name } = event.target; setInfrastructureMonitor({ ...infrastructureMonitor, - [formName]: value, + [name]: value, }); const { error } = infrastructureMonitorValidation.validate( - { [formName]: value }, + { [name]: value }, { abortEarly: false } ); setErrors((prev) => ({ ...prev, - ...(error ? { [formName]: error.details[0].message } : { [formName]: undefined }), + ...(error ? { [name]: error.details[0].message } : { [name]: undefined }), })); }; - const handleCheckboxChange = (event, formName) => { - console.log(event.target.checked, formName); + const handleCheckboxChange = (event) => { + const { name } = event.target; const { checked } = event.target; setInfrastructureMonitor({ ...infrastructureMonitor, - [formName]: checked, + [name]: checked, }); }; const handleBlur = (event) => { - console.log("hanldeBlur", event); + console.log("handleBlur", event); }; const handleNotifications = (event, type) => { @@ -277,12 +273,13 @@ const CreateInfrastructureMonitor = () => { } placeholder={"localhost:59232/api/v1/metrics"} label="Server URL" https={https} value={infrastructureMonitor.url} - onChange={(event) => handleChange(event, "url")} + onChange={handleChange} error={errors["url"] ? true : false} helperText={errors["url"]} /> @@ -308,19 +305,21 @@ const CreateInfrastructureMonitor = () => { handleChange(event, "name")} + onChange={handleChange} error={errors["name"]} /> handleChange(event, "secret")} + onChange={handleChange} error={errors["secret"] ? true : false} helperText={errors["secret"]} /> @@ -363,17 +362,19 @@ const CreateInfrastructureMonitor = () => { infrastructureMonitor={infrastructureMonitor} errors={errors} checkboxId={metric} + checkboxName={metric} checkboxLabel={ metric !== "cpu" ? capitalizeFirstLetter(metric) : metric.toUpperCase() } - onCheckboxChange={(event) => handleCheckboxChange(event, metric)} + onCheckboxChange={handleCheckboxChange} isChecked={infrastructureMonitor[metric]} fieldId={METRIC_PREFIX + metric} + fieldName={METRIC_PREFIX + metric} fieldValue={infrastructureMonitor[METRIC_PREFIX + metric]} - onFieldChange={(event) => handleChange(event, METRIC_PREFIX + metric)} - onFieldBlur={(event) => handleBlur(event, METRIC_PREFIX + metric)} + onFieldChange={handleChange} + onFieldBlur={handleBlur} alertUnit={metric == "temperature" ? "°C" : "%"} /> ); @@ -401,10 +402,11 @@ const CreateInfrastructureMonitor = () => {