diff --git a/client/src/Pages/PageSpeed/Setup/index.jsx b/client/src/Pages/PageSpeed/Setup/index.jsx
index b6cb7d615..c636ee667 100644
--- a/client/src/Pages/PageSpeed/Setup/index.jsx
+++ b/client/src/Pages/PageSpeed/Setup/index.jsx
@@ -13,7 +13,6 @@ import Dialog from "../../../Components/Dialog";
import { HttpAdornment } from "../../../Components/Inputs/TextInput/Adornments";
import Radio from "../../../Components/Inputs/Radio";
-
// Utils
import { useState, useEffect } from "react";
import { useSelector } from "react-redux";
@@ -27,463 +26,485 @@ import { createToast } from "../../../Utils/toastUtils";
import { useParams } from "react-router";
import { useMonitorUtils } from "../../../Hooks/useMonitorUtils";
import {
- useCreateMonitor,
- useFetchMonitorById,
- useDeleteMonitor,
- useUpdateMonitor,
- usePauseMonitor,
+ useCreateMonitor,
+ useFetchMonitorById,
+ useDeleteMonitor,
+ useUpdateMonitor,
+ usePauseMonitor,
} from "../../../Hooks/monitorHooks";
// Constants
const MS_PER_MINUTE = 60000;
const FREQUENCIES = [
- { _id: 3, name: "3 minutes" },
- { _id: 5, name: "5 minutes" },
- { _id: 10, name: "10 minutes" },
- { _id: 20, name: "20 minutes" },
- { _id: 60, name: "1 hour" },
- { _id: 1440, name: "1 day" },
- { _id: 10080, name: "1 week" },
+ { _id: 3, name: "3 minutes" },
+ { _id: 5, name: "5 minutes" },
+ { _id: 10, name: "10 minutes" },
+ { _id: 20, name: "20 minutes" },
+ { _id: 60, name: "1 hour" },
+ { _id: 1440, name: "1 day" },
+ { _id: 10080, name: "1 week" },
];
const PageSpeedSetup = ({ configure }) => {
- const isConfigure = configure;
- const { monitorId } = useParams();
- const CRUMBS = [
- { name: "pagespeed", path: "/pagespeed" },
- ...(isConfigure
- ? [
- { name: "details", path: `/pagespeed/${monitorId}` },
- { name: "configure", path: `/pagespeed/setup/${monitorId}` },
- ]
- : [{ name: "create", path: `/pagespeed/create` }]),
- ];
+ const isConfigure = configure;
+ const { monitorId } = useParams();
+ const CRUMBS = [
+ { name: "pagespeed", path: "/pagespeed" },
+ ...(isConfigure
+ ? [
+ { name: "details", path: `/pagespeed/${monitorId}` },
+ { name: "configure", path: `/pagespeed/setup/${monitorId}` },
+ ]
+ : [{ name: "create", path: `/pagespeed/create` }]),
+ ];
- // States
- const [monitor, setMonitor] = useState(isConfigure ? {} : {
- url: "",
- name: "",
- type: "pagespeed",
- notifications: [],
- interval: 180000,
- });
- const [https, setHttps] = useState(true);
- const [errors, setErrors] = useState({});
+ // States
+ const [monitor, setMonitor] = useState(
+ isConfigure
+ ? {}
+ : {
+ url: "",
+ name: "",
+ type: "pagespeed",
+ notifications: [],
+ interval: 180000,
+ }
+ );
+ const [https, setHttps] = useState(true);
+ const [errors, setErrors] = useState({});
- const [isOpen, setIsOpen] = useState(false);
- const [updateTrigger, setUpdateTrigger] = useState(false);
- const [isDeleting, setIsDeleting] = useState(false);
- const [isUpdating, setIsUpdating] = useState(false);
- const [isPausing, setIsPausing] = useState(false);
+ const [isOpen, setIsOpen] = useState(false);
+ const [updateTrigger, setUpdateTrigger] = useState(false);
+ const [isDeleting, setIsDeleting] = useState(false);
+ const [isUpdating, setIsUpdating] = useState(false);
+ const [isPausing, setIsPausing] = useState(false);
- // Setup
- const { t } = useTranslation();
- const theme = useTheme();
+ // Setup
+ const { t } = useTranslation();
+ const theme = useTheme();
const { user } = useSelector((state) => state.auth);
- const {
- statusColor,
- pagespeedStatusMsg,
- determineState
- } = useMonitorUtils();
- const [
- notifications,
- notificationsAreLoading,
- notificationsError
- ] = useGetNotificationsByTeamId();
+ const { statusColor, pagespeedStatusMsg, determineState } = useMonitorUtils();
+ const [notifications, notificationsAreLoading, notificationsError] =
+ useGetNotificationsByTeamId();
- // Hooks for API actions
- const [createMonitor, isCreating] = useCreateMonitor();
- const [isLoading] = isConfigure
- ? useFetchMonitorById({ monitorId, setMonitor, updateTrigger })
- : [false];
- const [deleteMonitor] = useDeleteMonitor();
- const [updateMonitor] = useUpdateMonitor();
- const [pauseMonitor] = usePauseMonitor();
+ // Hooks for API actions
+ const [createMonitor, isCreating] = useCreateMonitor();
+ const [isLoading] = isConfigure
+ ? useFetchMonitorById({ monitorId, setMonitor, updateTrigger })
+ : [false];
+ const [deleteMonitor] = useDeleteMonitor();
+ const [updateMonitor] = useUpdateMonitor();
+ const [pauseMonitor] = usePauseMonitor();
+ // Handlers
+ const onSubmit = async (event) => {
+ event.preventDefault();
+ if (isConfigure) {
+ await updateMonitor({ monitor, redirect: "/pagespeed" });
+ } else {
+ let form = {
+ url: `http${https ? "s" : ""}://` + monitor.url,
+ name: monitor.name === "" ? monitor.url : monitor.name,
+ type: monitor.type,
+ interval: monitor.interval,
+ };
- // Handlers
- const onSubmit = async (event) => {
- event.preventDefault();
- if (isConfigure) {
- await updateMonitor({ monitor, redirect: "/pagespeed" });
- } else {
- let form = {
- url: `http${https ? "s" : ""}://` + monitor.url,
- name: monitor.name === "" ? monitor.url : monitor.name,
- type: monitor.type,
- interval: monitor.interval,
- };
+ const { error } = monitorValidation.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;
+ }
- const { error } = monitorValidation.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;
- }
+ form = {
+ ...form,
+ description: form.name,
+ notifications: monitor.notifications,
+ };
+ await createMonitor({ monitor: form, redirect: "/pagespeed" });
+ }
+ };
- form = {
- ...form,
- description: form.name,
- notifications: monitor.notifications,
- };
- await createMonitor({ monitor: form, redirect: "/pagespeed" });
- }
- };
+ const handleChange = (event) => {
+ let { value, name } = event.target;
- const handleChange = (event) => {
- let { value, name } = event.target;
-
- if (name === "interval") {
+ if (name === "interval") {
value = value * MS_PER_MINUTE;
}
- setMonitor({
- ...monitor,
- [name]: value
- });
+ setMonitor({
+ ...monitor,
+ [name]: value,
+ });
- const { error } = monitorValidation.validate(
- { [name]: value },
- { abortEarly: false }
- );
- setErrors((prev) => ({
- ...prev,
- ...(error ? { [name]: error.details[0].message } : { [name]: undefined})
- }));
- };
+ const { error } = monitorValidation.validate(
+ { [name]: value },
+ { abortEarly: false }
+ );
+ setErrors((prev) => ({
+ ...prev,
+ ...(error ? { [name]: error.details[0].message } : { [name]: undefined }),
+ }));
+ };
- const handleBlur = (event) => {
- const { name, value } = event.target;
- if (name === "url" && monitor.name === "") {
- setMonitor((prev) => ({ ...prev, name: parseDomainName(value) }));
- }
- };
+ const handleBlur = (event) => {
+ const { name, value } = event.target;
+ if (name === "url" && monitor.name === "") {
+ setMonitor((prev) => ({ ...prev, name: parseDomainName(value) }));
+ }
+ };
const triggerUpdate = () => {
setUpdateTrigger(!updateTrigger);
};
- const handlePause = async () => {
- await pauseMonitor({ monitorId, triggerUpdate });
- };
+ const handlePause = async () => {
+ await pauseMonitor({ monitorId, triggerUpdate });
+ };
- const handleRemove = async (event) => {
- event.preventDefault();
- await deleteMonitor({ monitor, redirect: "/pagespeed" });
- };
+ const handleRemove = async (event) => {
+ event.preventDefault();
+ await deleteMonitor({ monitor, redirect: "/pagespeed" });
+ };
- // // Loading skeleton
- // if (isConfigure && (isLoading || !monitor._id)) {
- // return ;
- // }
-
- return (
-
- {Object.keys(monitor).length === 0 ? (
-
- ) : (
- <>
-
-
-
-
-
-
- {isConfigure ? monitor.name : t("createYour") + " "}
-
- { !isConfigure
- ? (
-
- {t("pageSpeedMonitor")}
-
- )
- : <>>
- }
-
- {isConfigure && (
-
-
-
-
-
-
-
- {monitor.url?.replace(/^https?:\/\//, "") || "..."}
-
-
- {t("editing")}
-
-
- )}
-
- {isConfigure && (
-
-
-
-
- )}
-
-
-
-
- {t("settingsGeneralSettings")}
-
-
- {t("pageSpeedConfigureSettingsDescription")}
-
-
-
+ {Object.keys(monitor).length === 0 ? (
+
+ ) : (
+ <>
+
+
+
+
+
+
+ {isConfigure ? monitor.name : t("createYour") + " "}
+
+ {!isConfigure ? (
+
+ {t("pageSpeedMonitor")}
+
+ ) : (
+ <>>
+ )}
+
+ {isConfigure && (
+
+
+
+
+
+
+
+ {monitor.url?.replace(/^https?:\/\//, "") || "..."}
+
+
+ {t("editing")}
+
+
+ )}
+
+ {isConfigure && (
+
+
+
+
+ )}
+
+
+
+
+ {t("settingsGeneralSettings")}
+
+
+ {t("pageSpeedConfigureSettingsDescription")}
+
+
+ .Mui-disabled)": {
backgroundColor: theme.palette.tertiary.main,
},
}}
- >
- : undefined}
- placeholder="random.website.com"
- value={monitor.url || ""}
- onChange={handleChange}
- onBlur={!isConfigure ? handleBlur : undefined}
- error={!!errors["url"]}
- helperText={errors["url"]}
- disabled={isConfigure}
- />
-
-
-
- {!isConfigure && (
-
-
-
- {t("distributedUptimeCreateChecks")}
-
-
- {t("distributedUptimeCreateChecksDescription")}
-
-
-
-
-
-
-
-
-
-
- {errors["type"] ? (
-
-
- {errors["type"]}
-
-
- ) : ""}
-
-
- )}
-
-
-
- {t("notificationConfig.title")}
-
- {t("notificationConfig.description")}
-
-
-
-
-
-
- {t("distributedUptimeCreateAdvancedSettings")}
-
-
-
-
-
-
-
-
-
-
- >
- )}
- {isConfigure && (
-
- );
+ >
+ : undefined
+ }
+ placeholder="random.website.com"
+ value={monitor.url || ""}
+ onChange={handleChange}
+ onBlur={!isConfigure ? handleBlur : undefined}
+ error={!!errors["url"]}
+ helperText={errors["url"]}
+ disabled={isConfigure}
+ />
+
+
+
+ {!isConfigure && (
+
+
+
+ {t("distributedUptimeCreateChecks")}
+
+
+ {t("distributedUptimeCreateChecksDescription")}
+
+
+
+
+
+
+
+
+
+
+ {errors["type"] ? (
+
+
+ {errors["type"]}
+
+
+ ) : (
+ ""
+ )}
+
+
+ )}
+
+
+
+ {t("notificationConfig.title")}
+
+
+ {t("notificationConfig.description")}
+
+
+
+
+
+
+
+ {t("distributedUptimeCreateAdvancedSettings")}
+
+
+
+
+
+
+
+
+
+
+ >
+ )}
+ {isConfigure && (
+