details
This commit is contained in:
1 parent
0453b790af
commit
b4135e26ce
7 files changed
+171
-11
No files matched your search
@@ -0,0 +1,120 @@
|
||||
import { BasePage, StatBox } from "@/components/design-elements";
|
||||
import Stack from "@mui/material/Stack";
|
||||
import Typography from "@mui/material/Typography";
|
||||
import { useTheme } from "@mui/material/styles";
|
||||
import { useParams } from "react-router";
|
||||
import { useGet } from "@/hooks/UseApi";
|
||||
import type { ApiResponse } from "@/hooks/UseApi";
|
||||
import type { IIncident } from "@/types/incident";
|
||||
import { formatDateWithTz } from "@/utils/TimeUtils";
|
||||
import { useAppSelector } from "@/hooks/AppHooks";
|
||||
import prettyMilliseconds from "pretty-ms";
|
||||
|
||||
const IncidentDetailsPage = () => {
|
||||
const theme = useTheme();
|
||||
const { id } = useParams<{ id: string }>();
|
||||
const uiTimezone = useAppSelector((state: any) => state.ui.timezone);
|
||||
|
||||
const { response } = useGet<ApiResponse<IIncident>>(`/incidents/${id}`);
|
||||
const incident = response?.data || null;
|
||||
|
||||
if (!incident) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const startMs = new Date(incident.startedAt).getTime();
|
||||
const endMs = incident.endedAt
|
||||
? new Date(incident.endedAt).getTime()
|
||||
: Date.now();
|
||||
const duration = Math.max(0, endMs - startMs);
|
||||
|
||||
return (
|
||||
<BasePage>
|
||||
<Stack spacing={theme.spacing(8)}>
|
||||
<Typography variant="h4" color="textPrimary">
|
||||
Incident Details
|
||||
</Typography>
|
||||
|
||||
<Stack direction={{ xs: "column", md: "row" }} gap={theme.spacing(8)}>
|
||||
<StatBox
|
||||
title="Monitor"
|
||||
subtitle={incident.monitorId?.name || "N/A"}
|
||||
/>
|
||||
<StatBox
|
||||
title="Start"
|
||||
subtitle={formatDateWithTz(
|
||||
incident.startedAt,
|
||||
"ddd, MMMM D, YYYY, HH:mm A",
|
||||
uiTimezone
|
||||
)}
|
||||
/>
|
||||
<StatBox
|
||||
title="End"
|
||||
subtitle={
|
||||
incident.endedAt
|
||||
? formatDateWithTz(
|
||||
incident.endedAt,
|
||||
"ddd, MMMM D, YYYY, HH:mm A",
|
||||
uiTimezone
|
||||
)
|
||||
: "Ongoing"
|
||||
}
|
||||
/>
|
||||
</Stack>
|
||||
|
||||
<Stack spacing={theme.spacing(4)}>
|
||||
<Typography variant="h6" color="textPrimary">
|
||||
Resolution
|
||||
</Typography>
|
||||
<Stack
|
||||
direction={"column"}
|
||||
spacing={theme.spacing(4)}
|
||||
sx={{
|
||||
p: theme.spacing(4),
|
||||
borderRadius: 2,
|
||||
bgcolor: incident.resolved
|
||||
? (theme.palette.success.lowContrast as any)
|
||||
: (theme.palette.error.lowContrast as any),
|
||||
}}
|
||||
>
|
||||
<Typography variant="body2" color="textPrimary">
|
||||
Status: {incident.resolved ? "Resolved" : "Unresolved"}
|
||||
</Typography>
|
||||
{incident.resolved && (
|
||||
<>
|
||||
<Typography variant="body2" color="textPrimary">
|
||||
Type: {incident.resolutionType || "N/A"}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="textPrimary">
|
||||
By: {incident.resolvedBy?.email || "N/A"}
|
||||
</Typography>
|
||||
</>
|
||||
)}
|
||||
<Typography variant="body2" color="textPrimary">
|
||||
{incident.resolved && incident.endedAt
|
||||
? `Resolved at: ${formatDateWithTz(
|
||||
incident.endedAt,
|
||||
"ddd, MMMM D, YYYY, HH:mm A",
|
||||
uiTimezone
|
||||
)}`
|
||||
: `Ongoing since: ${formatDateWithTz(
|
||||
incident.startedAt,
|
||||
"ddd, MMMM D, YYYY, HH:mm A",
|
||||
uiTimezone
|
||||
)}`}
|
||||
</Typography>
|
||||
</Stack>
|
||||
<Typography variant="body2" color="textSecondary">
|
||||
Duration:{" "}
|
||||
{prettyMilliseconds(duration, { secondsDecimalDigits: 0 })}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="textSecondary">
|
||||
Note: {incident.resolutionNote || "N/A"}
|
||||
</Typography>
|
||||
</Stack>
|
||||
</Stack>
|
||||
</BasePage>
|
||||
);
|
||||
};
|
||||
|
||||
export default IncidentDetailsPage;
|
||||
@@ -9,6 +9,7 @@ import { useTranslation } from "react-i18next";
|
||||
import { formatDateWithTz } from "@/utils/TimeUtils";
|
||||
import { useAppSelector } from "@/hooks/AppHooks";
|
||||
import type { IIncident } from "@/types/incident";
|
||||
import { useNavigate } from "react-router";
|
||||
|
||||
export const IncidentTable = ({
|
||||
incidents,
|
||||
@@ -30,6 +31,7 @@ export const IncidentTable = ({
|
||||
const { patch, loading: isPatching } = usePatch();
|
||||
const { t } = useTranslation();
|
||||
const uiTimezone = useAppSelector((state: any) => state.ui.timezone);
|
||||
const navigate = useNavigate();
|
||||
|
||||
const getHeaders = (t: Function, uiTimezone: string) => {
|
||||
const headers: Header<IIncident>[] = [
|
||||
@@ -150,7 +152,7 @@ export const IncidentTable = ({
|
||||
headers={headers}
|
||||
data={incidents}
|
||||
onRowClick={(row) => {
|
||||
alert(JSON.stringify(row, null, 2));
|
||||
navigate(`/incidents/${row._id}`);
|
||||
}}
|
||||
/>
|
||||
<Pagination
|
||||
|
||||
@@ -19,6 +19,7 @@ import NotificationChannelsPage from "@/pages/notification-channels/Notification
|
||||
import NotificationChannelsCreatePage from "@/pages/notification-channels/NotificationChannelsCreate";
|
||||
import NotificationChannelsConfigPage from "@/pages/notification-channels/NotificationChannelsConfig";
|
||||
import IncidentsPage from "@/pages/incidents/IncidentsPage";
|
||||
import IncidentDetailsPage from "@/pages/incidents/IncidentDetails";
|
||||
import PageSpeedMonitorsPage from "@/pages/pagespeed/PageSpeedMonitors";
|
||||
import PageSpeedDetailsPage from "@/pages/pagespeed/PageSpeedDetails";
|
||||
import PageSpeedConfigurePage from "@/pages/pagespeed/PageSpeedConfig";
|
||||
@@ -110,7 +111,7 @@ const Router = () => {
|
||||
element={<NotificationChannelsPage />}
|
||||
/>
|
||||
<Route path="incidents" element={<IncidentsPage />} />
|
||||
<Route path="incidents/:id" element={<IncidentsPage />} />
|
||||
<Route path="incidents/:id" element={<IncidentDetailsPage />} />
|
||||
<Route path="pagespeed/create" element={<PageSpeedCreatePage />} />
|
||||
<Route
|
||||
path="pagespeed/:id/configure"
|
||||
|
||||
@@ -10,6 +10,7 @@ const logger = getChildLogger("IncidentController");
|
||||
|
||||
export interface IIncidentsController {
|
||||
getIncidents: (req: Request, res: Response, next: NextFunction) => void;
|
||||
getIncidentById: (req: Request, res: Response, next: NextFunction) => void;
|
||||
resolveIncident: (req: Request, res: Response, next: NextFunction) => void;
|
||||
}
|
||||
|
||||
@@ -58,6 +59,34 @@ class IncidentsController implements IIncidentsController {
|
||||
}
|
||||
};
|
||||
|
||||
getIncidentById = async (req: Request, res: Response, next: NextFunction) => {
|
||||
try {
|
||||
const userContext = req.user;
|
||||
if (!userContext) {
|
||||
return res.status(401).json({ message: "Unauthorized" });
|
||||
}
|
||||
|
||||
const teamId = userContext.currentTeamId;
|
||||
if (!teamId) {
|
||||
throw new ApiError("No team ID", 400);
|
||||
}
|
||||
|
||||
const { id } = req.params;
|
||||
if (!id) {
|
||||
throw new ApiError("No incident ID", 400);
|
||||
}
|
||||
|
||||
const incident = await this.incidentService.get(teamId, id);
|
||||
if (!incident) {
|
||||
throw new ApiError("Incident not found", 404);
|
||||
}
|
||||
|
||||
res.status(200).json({ message: "OK", data: incident });
|
||||
} catch (error) {
|
||||
next(error);
|
||||
}
|
||||
};
|
||||
|
||||
resolveIncident = async (req: Request, res: Response, next: NextFunction) => {
|
||||
try {
|
||||
const userContext = req.user;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Router } from "express";
|
||||
|
||||
import { ChecksController, IncidentsController } from "@/controllers/index.js";
|
||||
import { IncidentsController } from "@/controllers/index.js";
|
||||
import { verifyToken } from "@/middleware/VerifyToken.js";
|
||||
import { addUserContext } from "@/middleware/AddUserContext.js";
|
||||
import { validateQuery, validateBody } from "@/middleware/validation.js";
|
||||
@@ -8,6 +8,7 @@ import { verifyOrgPermission } from "@/middleware/VerifyPermission.js";
|
||||
import { PERMISSIONS } from "@/types/permissions.js";
|
||||
import {
|
||||
getIncidentsQuerySchema,
|
||||
getIncidentQuerySchema,
|
||||
patchIncidentsBodySchema,
|
||||
} from "@/validation/index.js";
|
||||
|
||||
@@ -29,6 +30,13 @@ class IncidentsRoutes {
|
||||
validateQuery(getIncidentsQuerySchema),
|
||||
this.controller.getIncidents
|
||||
);
|
||||
this.router.get(
|
||||
"/:id",
|
||||
verifyToken,
|
||||
addUserContext,
|
||||
verifyOrgPermission([PERMISSIONS.incidents.read]),
|
||||
this.controller.getIncidentById
|
||||
);
|
||||
|
||||
this.router.patch(
|
||||
"/:id/resolve",
|
||||
|
||||
@@ -26,10 +26,7 @@ export interface IIncidentService {
|
||||
monitorId: mongoose.Types.ObjectId,
|
||||
startCheckId: mongoose.Types.ObjectId
|
||||
) => Promise<IIncident>;
|
||||
get: (
|
||||
teamId: mongoose.Types.ObjectId,
|
||||
incidentId: mongoose.Types.ObjectId
|
||||
) => Promise<IIncident | null>;
|
||||
get: (teamId: string, incidentId: string) => Promise<IIncident | null>;
|
||||
getAll: (
|
||||
teamId: string,
|
||||
monitorId: string,
|
||||
@@ -191,10 +188,7 @@ class IncidentService implements IIncidentService {
|
||||
return incident;
|
||||
};
|
||||
|
||||
get = async (
|
||||
teamId: mongoose.Types.ObjectId,
|
||||
incidentId: mongoose.Types.ObjectId
|
||||
) => {
|
||||
get = async (teamId: string, incidentId: string) => {
|
||||
const incident = await Incident.findOne({
|
||||
_id: new mongoose.Types.ObjectId(incidentId),
|
||||
teamId: new mongoose.Types.ObjectId(teamId),
|
||||
|
||||
@@ -517,6 +517,12 @@ export const profileSchema = z
|
||||
}
|
||||
);
|
||||
|
||||
export const getIncidentQuerySchema = z.object({
|
||||
id: z.string().refine((val) => mongoose.Types.ObjectId.isValid(val), {
|
||||
message: "Invalid MongoDB ObjectId",
|
||||
}),
|
||||
});
|
||||
|
||||
export const getIncidentsQuerySchema = z.object({
|
||||
resolutionType: z.enum(ResolutionTypes).optional(),
|
||||
resolved: z
|
||||
|
||||
Reference in new issue
Block a user