improve error handling in network service, fix username form errors

This commit is contained in:
Alex Holliday committed 2024-09-26 11:01:38 +08:00
1 parent 09fb5595ab
commit 38ee162f61
4 files changed
+29 -4

No files matched your search

+10 -1
View File
@@ -16,6 +16,7 @@ import "./index.css";
* @param {Object} props
* @param {string} [props.type] - Type of input field (e.g., 'text', 'password').
* @param {string} props.id - ID of the input field.
* @param {string} props.name - Name of the input field.
* @param {string} [props.label] - Label for the input field.
* @param {boolean} [props.https] - Indicates if it should display http or https.
* @param {boolean} [props.isRequired] - Indicates if the field is required, will display a red asterisk.
@@ -27,6 +28,7 @@ import "./index.css";
* @param {function} props.onChange - Function called on input change.
* @param {string} [props.error] - Error message to display for the input field.
* @param {boolean} [props.disabled] - Indicates if the input field is disabled.
* @param {boolean} [props.hidden] - Indicates if the input field is hidden.
* @param {React.Ref} [ref] - Ref forwarded to the underlying `TextField` component. Allows for direct interactions such as focusing.
*/
@@ -35,6 +37,7 @@ const Field = forwardRef(
{
type = "text",
id,
name,
label,
https,
isRequired,
@@ -47,6 +50,7 @@ const Field = forwardRef(
onInput,
error,
disabled,
hidden,
},
ref
) => {
@@ -107,6 +111,7 @@ const Field = forwardRef(
)}
<TextField
type={type === "password" ? (isVisible ? "text" : type) : type}
name={name}
id={id}
autoComplete={autoComplete}
placeholder={placeholder}
@@ -136,7 +141,9 @@ const Field = forwardRef(
borderBottomLeftRadius: theme.shape.borderRadius,
},
}
: {}
: {
display: hidden ? "none" : "",
}
}
InputProps={{
startAdornment: type === "url" && (
@@ -213,6 +220,7 @@ Field.propTypes = {
"number",
]),
id: PropTypes.string.isRequired,
name: PropTypes.string,
label: PropTypes.string,
https: PropTypes.bool,
isRequired: PropTypes.bool,
@@ -225,6 +233,7 @@ Field.propTypes = {
onInput: PropTypes.func,
error: PropTypes.string,
disabled: PropTypes.bool,
hidden: PropTypes.bool,
};
export default Field;
@@ -1,5 +1,5 @@
import TabPanel from "@mui/lab/TabPanel";
import React, { useState } from "react";
import { useState } from "react";
import { useTheme } from "@emotion/react";
import { Box, Stack, Typography } from "@mui/material";
import LoadingButton from "@mui/lab/LoadingButton";
@@ -116,6 +116,14 @@ const PasswordPanel = () => {
<Box flex={0.9}>
<Typography component="h1">Current password</Typography>
</Box>
<Field
type="text"
id="hidden-username"
name="username"
autoComplete="username"
hidden={true}
value=""
/>
<Field
type="password"
id="edit-current-password"
+1
View File
@@ -325,6 +325,7 @@ const deleteMonitor = async (req, res, next) => {
logger.error(
`Error deleting associated records for monitor ${monitor._id} with name ${monitor.name}`,
{
method: "deleteMonitor",
service: SERVICE_NAME,
error: error.message,
}
+9 -2
View File
@@ -44,10 +44,17 @@ class NetworkService {
}
async handleStatusUpdate(job, isAlive) {
let monitor;
// Look up the monitor, if it doesn't exist, it's probably been removed, return
try {
const { _id } = job.data;
const monitor = await this.db.getMonitorById(_id);
monitor = await this.db.getMonitorById(_id);
} catch (error) {
return;
}
// Otherwise, try to update monitor status
try {
if (monitor === null || monitor === undefined) {
logger.error(`Null Monitor: ${_id}`, {
method: "handleStatusUpdate",
@@ -90,7 +97,7 @@ class NetworkService {
const endTime = Date.now();
error.responseTime = endTime - startTime;
error.service === undefined ? (error.service = SERVICE_NAME) : null;
error.mheotd === undefined
error.method === undefined
? (error.method = "measureResponseTime")
: null;
throw error;