Merge remote-tracking branch 'origin/develop' into improve/light-mode-ui

client/src/Hooks/useMonitorUtils.js

@@ -6,18 +6,18 @@ const useMonitorUtils = () => {
 		let uptimePercentage = "";
 		let percentageColor = "";
 
-		if (monitor.uptimePercentage !== undefined) {
+		if (monitor?.uptimePercentage !== undefined) {
 			uptimePercentage =
-				monitor.uptimePercentage === 0
+				monitor?.uptimePercentage === 0
 					? "0"
-					: (monitor.uptimePercentage * 100).toFixed(2);
+					: (monitor?.uptimePercentage * 100).toFixed(2);
 
 			percentageColor =
-				monitor.uptimePercentage < 0.25
+				monitor?.uptimePercentage < 0.25
 					? theme.palette.error.main
-					: monitor.uptimePercentage < 0.5
+					: monitor?.uptimePercentage < 0.5
 						? theme.palette.warning.main
-						: monitor.uptimePercentage < 0.75
+						: monitor?.uptimePercentage < 0.75
 							? theme.palette.success.main
 							: theme.palette.success.main;
 		}
@@ -32,7 +32,7 @@ const useMonitorUtils = () => {
 
 	const determineState = useCallback((monitor) => {
 		if (typeof monitor === "undefined") return "pending";
-		if (monitor.isActive === false) return "paused";
+		if (monitor?.isActive === false) return "paused";
 		if (monitor?.status === undefined) return "pending";
 		return monitor?.status == true ? "up" : "down";
 	}, []);

client/src/Pages/Uptime/Configure/index.jsx

@@ -163,18 +163,18 @@ const Configure = () => {
 		e.preventDefault();
 
 		const toSubmit = {
-			_id: form._id,
-			url: form.url,
-			name: form.name,
-			type: form.type,
-			matchMethod: form.matchMethod,
-			expectedValue: form.expectedValue,
-			jsonPath: form.jsonPath,
-			interval: form.interval,
-			teamId: form.teamId,
-			userId: form.userId,
-			port: form.port,
-			ignoreTlsErrors: form.ignoreTlsErrors,
+			_id: form?._id,
+			url: form?.url,
+			name: form?.name,
+			type: form?.type,
+			matchMethod: form?.matchMethod,
+			expectedValue: form?.expectedValue,
+			jsonPath: form?.jsonPath,
+			interval: form?.interval,
+			teamId: form?.teamId,
+			userId: form?.userId,
+			port: form?.port,
+			ignoreTlsErrors: form?.ignoreTlsErrors,
 		};
 
 		if (!useAdvancedMatching) {
@@ -197,7 +197,7 @@ const Configure = () => {
 			return;
 		}
 
-		toSubmit.notifications = form.notifications;
+		toSubmit.notifications = form?.notifications;
 		await updateMonitor({ monitor: toSubmit, redirect: "/uptime" });
 	};
 
@@ -235,7 +235,7 @@ const Configure = () => {
 							component="h1"
 							variant="monitorName"
 						>
-							{form.name}
+							{form?.name}
 						</Typography>
 						<Stack
 							direction="row"
@@ -267,7 +267,7 @@ const Configure = () => {
 								component="h2"
 								variant="monitorUrl"
 							>
-								{form.url?.replace(/^https?:\/\//, "") || "..."}
+								{form?.url?.replace(/^https?:\/\//, "") || "..."}
 							</Typography>
 							<Typography
 								position="relative"
@@ -352,11 +352,11 @@ const Configure = () => {
 							type="number"
 							label={t("portToMonitor")}
 							placeholder="5173"
-							value={form.port || ""}
+							value={form?.port || ""}
 							onChange={onChange}
 							error={errors["port"] ? true : false}
 							helperText={errors["port"]}
-							hidden={form.type !== "port"}
+							hidden={form?.type !== "port"}
 						/>
 						<TextInput
 							name="name"
@@ -379,7 +379,7 @@ const Configure = () => {
 					<NotificationsConfig
 						notifications={notifications}
 						setMonitor={setForm}
-						setNotifications={form.notifications}
+						setNotifications={form?.notifications}
 					/>
 				</ConfigBox>
 				<ConfigBox>
@@ -398,7 +398,7 @@ const Configure = () => {
 							control={
 								<Switch
 									name="ignoreTlsErrors"
-									checked={form.ignoreTlsErrors ?? false}
+									checked={form?.ignoreTlsErrors ?? false}
 									onChange={onChange}
 									sx={{ mr: theme.spacing(2) }}
 								/>
@@ -430,12 +430,12 @@ const Configure = () => {
 							isChecked={useAdvancedMatching}
 							onChange={onChange}
 						/>
-						{form.type === "http" && useAdvancedMatching && (
+						{form?.type === "http" && useAdvancedMatching && (
 							<>
 								<Select
 									name="matchMethod"
 									label={t("matchMethod")}
-									value={form.matchMethod || "equal"}
+									value={form?.matchMethod || "equal"}
 									onChange={onChange}
 									items={matchMethodOptions}
 								/>
@@ -445,8 +445,8 @@ const Configure = () => {
 										name="expectedValue"
 										label={t("expectedValue")}
 										isOptional={true}
-										placeholder={expectedValuePlaceholders[form.matchMethod || "equal"]}
-										value={form.expectedValue}
+										placeholder={expectedValuePlaceholders[form?.matchMethod || "equal"]}
+										value={form?.expectedValue}
 										onChange={onChange}
 										error={errors["expectedValue"] ? true : false}
 										helperText={errors["expectedValue"]}
@@ -466,7 +466,7 @@ const Configure = () => {
 										label="JSON Path"
 										isOptional={true}
 										placeholder="data.status"
-										value={form.jsonPath}
+										value={form?.jsonPath}
 										onChange={onChange}
 										error={errors["jsonPath"] ? true : false}
 										helperText={errors["jsonPath"]}

client/src/Utils/NetworkService.js

@@ -111,30 +111,6 @@ class NetworkService {
 		return this.axiosInstance.post(`/monitors`, monitor);
 	}
 
-	/**
-	 *
-	 * ************************************
-	 * Check the endpoint resolution
-	 * ************************************
-	 *
-	 * @async
-	 * @param {Object} config - The configuration object.
-	 * @param {Object} config.monitorURL - The monitor url to be sent in the request body.
-	 * @returns {Promise<AxiosResponse>} The response from the axios POST request.
-	 */
-	async checkEndpointResolution(config) {
-		const { monitorURL } = config;
-		const params = new URLSearchParams();
-
-		if (monitorURL) params.append("monitorURL", monitorURL);
-
-		return this.axiosInstance.get(`/monitors/resolution/url?${params.toString()}`, {
-			headers: {
-				"Content-Type": "application/json",
-			},
-		});
-	}
-
 	/**
 	 * ************************************
 	 * Get all uptime monitors for a Team