diff --git a/Client/src/Components/HttpStatusLabel/index.jsx b/Client/src/Components/HttpStatusLabel/index.jsx
new file mode 100644
index 000000000..dddd4e472
--- /dev/null
+++ b/Client/src/Components/HttpStatusLabel/index.jsx
@@ -0,0 +1,72 @@
+import PropTypes from "prop-types";
+import { useTheme } from "@mui/material";
+import { BaseLabel } from "../Label";
+
+/**
+ * @component
+ * @param {Object} props
+ * @param {number} props.status - The http status for the label
+ * @param {Styles} props.customStyles - CSS Styles passed from parent component
+ * @returns {JSX.Element}
+ * @example
+ * // Render a http status label
+ *
+ */
+
+const DEFAULT_CODE = 9999; // Default code for unknown status
+
+const handleStatusCode = (status) => {
+ if (status >= 100 && status < 600) {
+ return status;
+ }
+ return DEFAULT_CODE;
+};
+
+const getRoundedStatusCode = (status) => {
+ return Math.floor(status / 100) * 100;
+};
+
+const HttpStatusLabel = ({ status, customStyles }) => {
+ const theme = useTheme();
+ const colors = {
+ 400: {
+ dotColor: theme.palette.warning.main,
+ bgColor: theme.palette.warning.bg,
+ borderColor: theme.palette.warning.light,
+ },
+ 500: {
+ dotColor: theme.palette.error.main,
+ bgColor: theme.palette.error.bg,
+ borderColor: theme.palette.error.light,
+ },
+ default: {
+ dotColor: theme.palette.unresolved.main,
+ bgColor: theme.palette.unresolved.bg,
+ borderColor: theme.palette.unresolved.light,
+ },
+ };
+
+ const statusCode = handleStatusCode(status)
+
+ const { borderColor, bgColor, dotColor } =
+ colors[getRoundedStatusCode(statusCode)] || colors.default;
+
+ return (
+
+ );
+};
+
+HttpStatusLabel.propTypes = {
+ status:PropTypes.number,
+ customStyles: PropTypes.object,
+};
+
+export { HttpStatusLabel };
diff --git a/Client/src/Components/Label/index.jsx b/Client/src/Components/Label/index.jsx
index 664cfd4af..1a372c8a1 100644
--- a/Client/src/Components/Label/index.jsx
+++ b/Client/src/Components/Label/index.jsx
@@ -182,4 +182,4 @@ StatusLabel.propTypes = {
customStyles: PropTypes.object,
};
-export { ColoredLabel, StatusLabel };
+export { BaseLabel, ColoredLabel, StatusLabel };
diff --git a/Client/src/Pages/Incidents/IncidentTable/index.jsx b/Client/src/Pages/Incidents/IncidentTable/index.jsx
index 69eed2ba1..1d0be7666 100644
--- a/Client/src/Pages/Incidents/IncidentTable/index.jsx
+++ b/Client/src/Pages/Incidents/IncidentTable/index.jsx
@@ -24,6 +24,7 @@ import { useTheme } from "@emotion/react";
import { formatDateWithTz } from "../../../Utils/timeUtils";
import PlaceholderLight from "../../../assets/Images/data_placeholder.svg?react";
import PlaceholderDark from "../../../assets/Images/data_placeholder_dark.svg?react";
+import { HttpStatusLabel } from "../../../Components/HttpStatusLabel";
import { Empty } from "./Empty/Empty";
import { IncidentSkeleton } from "./Skeleton/Skeleton";
@@ -184,7 +185,7 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
"YYYY-MM-DD HH:mm:ss A",
uiTimezone
);
-
+
return (
{monitors[check.monitorId]?.name}
@@ -196,7 +197,9 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
/>
{formattedDate}
- {check.statusCode ? check.statusCode : "N/A"}
+
+
+
{check.message}
);