Skip to content

Open-source status page, incident response and uptime monitoring

fix: maintenance markdown preview and more (#1386)

Maximilian Kaskee5ec18623569
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx
index fe0a30eb5..48c8fc6d9 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/page.tsx
@@ -78,7 +78,7 @@ export default function Page() {
</>
) : undefined
}
- monitors={monitors}
+ monitors={page.monitors}
onSubmit={async (values) => {
// NOTE: for type safety, we need to check if the values have a date property
// because of the union type
diff --git a/apps/dashboard/src/components/data-table/maintenances/columns.tsx b/apps/dashboard/src/components/data-table/maintenances/columns.tsx
index ef21abd68..42ff5d61a 100644
--- a/apps/dashboard/src/components/data-table/maintenances/columns.tsx
+++ b/apps/dashboard/src/components/data-table/maintenances/columns.tsx
@@ -1,5 +1,6 @@
"use client";
+import { ProcessMessage } from "@/components/content/process-message";
import { TableCellNumber } from "@/components/data-table/table-cell-number";
import { DataTableColumnHeader } from "@/components/ui/data-table/data-table-column-header";
import type { RouterOutputs } from "@openstatus/api";
@@ -25,7 +26,7 @@ export const columns: ColumnDef<Maintenance>[] = [
const value = String(row.getValue("message"));
return (
<div className="max-w-[200px] truncate text-muted-foreground">
- {value}
+ <ProcessMessage value={value} />
</div>
);
},
diff --git a/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx
index b9ff5e345..cae611357 100644
--- a/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx
+++ b/apps/dashboard/src/components/data-table/status-reports/data-table-row-actions.tsx
@@ -8,7 +8,6 @@ import { useTRPC } from "@/lib/trpc/client";
import type { RouterOutputs } from "@openstatus/api";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import type { Row } from "@tanstack/react-table";
-import { useParams } from "next/navigation";
import { useRef } from "react";
type StatusReport = RouterOutputs["statusReport"]["list"][number];
@@ -17,7 +16,11 @@ interface DataTableRowActionsProps {
row: Row<StatusReport>;
}
+// NOTE: avoid using useParams to get status page :id
+// because we are using the table in the /overview page
+
export function DataTableRowActions({ row }: DataTableRowActionsProps) {
+ if (!row.original.pageId) return null;
const buttonCreateRef = useRef<HTMLButtonElement>(null);
const buttonUpdateRef = useRef<HTMLButtonElement>(null);
const actions = getActions({
@@ -26,7 +29,10 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
"view-report": () => {
if (typeof window !== "undefined") {
window.open(
- `https://${row.original.page.customDomain || `${row.original.page.slug}.openstatus.dev`}/events/report/${row.original.id}`,
+ `https://${
+ row.original.page.customDomain ||
+ `${row.original.page.slug}.openstatus.dev`
+ }/events/report/${row.original.id}`,
"_blank",
);
}
@@ -34,8 +40,9 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
});
const trpc = useTRPC();
const queryClient = useQueryClient();
- const { id } = useParams<{ id: string }>();
- const { data: monitors } = useQuery(trpc.monitor.list.queryOptions());
+ const { data: page } = useQuery(
+ trpc.page.get.queryOptions({ id: row.original.pageId }),
+ );
const sendStatusReportUpdateMutation = useMutation(
trpc.emailRouter.sendStatusReport.mutationOptions(),
);
@@ -44,7 +51,7 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
onSuccess: () => {
queryClient.invalidateQueries({
queryKey: trpc.statusReport.list.queryKey({
- pageId: Number.parseInt(id),
+ pageId: row.original.pageId ?? undefined,
}),
});
queryClient.invalidateQueries({
@@ -63,7 +70,7 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
//
queryClient.invalidateQueries({
queryKey: trpc.statusReport.list.queryKey({
- pageId: Number.parseInt(id),
+ pageId: row.original.pageId ?? undefined,
}),
});
queryClient.invalidateQueries({
@@ -77,7 +84,7 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
onSuccess: () => {
queryClient.invalidateQueries({
queryKey: trpc.statusReport.list.queryKey({
- pageId: Number.parseInt(id),
+ pageId: row.original.pageId ?? undefined,
}),
});
queryClient.invalidateQueries({
@@ -87,8 +94,6 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
}),
);
- if (!monitors) return null;
-
return (
<>
<QuickActions
@@ -103,7 +108,7 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
}}
/>
<FormSheetStatusReport
- monitors={monitors}
+ monitors={page?.monitors ?? []}
defaultValues={{
title: row.original.title,
status: row.original.status,
diff --git a/apps/dashboard/src/components/forms/maintenance/form.tsx b/apps/dashboard/src/components/forms/maintenance/form.tsx
index d25c42d1f..cb7b23d6e 100644
--- a/apps/dashboard/src/components/forms/maintenance/form.tsx
+++ b/apps/dashboard/src/components/forms/maintenance/form.tsx
@@ -4,6 +4,7 @@ import {
EmptyStateContainer,
EmptyStateTitle,
} from "@/components/content/empty-state";
+import { ProcessMessage } from "@/components/content/process-message";
import {
FormCardContent,
FormCardSeparator,
@@ -164,7 +165,18 @@ export function FormMaintenance({
<Calendar
mode="single"
selected={field.value}
- onSelect={field.onChange}
+ onSelect={(selectedDate) => {
+ if (!selectedDate) return;
+
+ const newDate = new Date(selectedDate);
+ newDate.setHours(
+ field.value.getHours(),
+ field.value.getMinutes(),
+ field.value.getSeconds(),
+ field.value.getMilliseconds(),
+ );
+ field.onChange(newDate);
+ }}
initialFocus
/>
<div className="border-t p-3">
@@ -177,17 +189,30 @@ export function FormMaintenance({
id="time"
type="time"
step="1"
- defaultValue={format(field.value, "HH:mm")}
+ value={
+ field.value
+ ? field.value.toTimeString().slice(0, 8)
+ : new Date().toTimeString().slice(0, 8)
+ }
className="peer appearance-none ps-9 [&::-webkit-calendar-picker-indicator]:hidden [&::-webkit-calendar-picker-indicator]:appearance-none"
onChange={(e) => {
try {
- const date = field.value
- ?.toISOString()
- .split("T")[0];
+ const timeValue = e.target.value;
+ if (!timeValue || !field.value) return;
+
+ const [hours, minutes, seconds] = timeValue
+ .split(":")
+ .map(Number);
- field.onChange(
- new Date(`${date}T${e.target.value}`),
+ const newDate = new Date(field.value);
+ newDate.setHours(
+ hours,
+ minutes,
+ seconds || 0,
+ 0,
);
+
+ field.onChange(newDate);
} catch (error) {
console.error(error);
}
@@ -244,7 +269,18 @@ export function FormMaintenance({
<Calendar
mode="single"
selected={field.value}
- onSelect={field.onChange}
+ onSelect={(selectedDate) => {
+ if (!selectedDate) return;
+
+ const newDate = new Date(selectedDate);
+ newDate.setHours(
+ field.value.getHours(),
+ field.value.getMinutes(),
+ field.value.getSeconds(),
+ field.value.getMilliseconds(),
+ );
+ field.onChange(newDate);
+ }}
initialFocus
/>
<div className="border-t p-3">
@@ -257,17 +293,30 @@ export function FormMaintenance({
id="time"
type="time"
step="1"
- defaultValue={format(field.value, "HH:mm")}
+ value={
+ field.value
+ ? field.value.toTimeString().slice(0, 8)
+ : new Date().toTimeString().slice(0, 8)
+ }
className="peer appearance-none ps-9 [&::-webkit-calendar-picker-indicator]:hidden [&::-webkit-calendar-picker-indicator]:appearance-none"
onChange={(e) => {
try {
- const date = field.value
- ?.toISOString()
- .split("T")[0];
+ const timeValue = e.target.value;
+ if (!timeValue || !field.value) return;
+
+ const [hours, minutes, seconds] = timeValue
+ .split(":")
+ .map(Number);
- field.onChange(
- new Date(`${date}T${e.target.value}`),
+ const newDate = new Date(field.value);
+ newDate.setHours(
+ hours,
+ minutes,
+ seconds || 0,
+ 0,
);
+
+ field.onChange(newDate);
} catch (error) {
console.error(error);
}
@@ -313,9 +362,9 @@ export function FormMaintenance({
<TabsContent value="tab-2">
<div className="grid gap-2">
<Label>Preview</Label>
- <p className="rounded-md border px-3 py-2 text-foreground text-sm">
- {watchMessage}
- </p>
+ <div className="rounded-md border px-3 py-2 text-foreground text-sm">
+ <ProcessMessage value={watchMessage} />
+ </div>
</div>
</TabsContent>
</Tabs>
diff --git a/apps/dashboard/src/components/forms/status-report-update/form.tsx b/apps/dashboard/src/components/forms/status-report-update/form.tsx
index f30aad20b..6e400f552 100644
--- a/apps/dashboard/src/components/forms/status-report-update/form.tsx
+++ b/apps/dashboard/src/components/forms/status-report-update/form.tsx
@@ -176,7 +176,17 @@ export function FormStatusReportUpdate({
<Calendar
mode="single"
selected={field.value}
- onSelect={field.onChange}
+ onSelect={(selectedDate) => {
+ if (!selectedDate) return;
+ const newDate = new Date(selectedDate);
+ newDate.setHours(
+ field.value.getHours(),
+ field.value.getMinutes(),
+ field.value.getSeconds(),
+ field.value.getMilliseconds(),
+ );
+ field.onChange(newDate);
+ }}
disabled={(date) =>
date > new Date() || date < new Date("1900-01-01")
}
@@ -192,17 +202,26 @@ export function FormStatusReportUpdate({
id="time"
type="time"
step="1"
- defaultValue={format(field.value, "HH:mm")}
+ defaultValue={new Date().toTimeString().slice(0, 8)}
className="peer appearance-none ps-9 [&::-webkit-calendar-picker-indicator]:hidden [&::-webkit-calendar-picker-indicator]:appearance-none"
onChange={(e) => {
try {
- const date = field.value
- ?.toISOString()
- .split("T")[0];
+ const timeValue = e.target.value;
+ if (!timeValue || !field.value) return;
- field.onChange(
- new Date(`${date}T${e.target.value}`),
+ const [hours, minutes, seconds] = timeValue
+ .split(":")
+ .map(Number);
+
+ const newDate = new Date(field.value);
+ newDate.setHours(
+ hours,
+ minutes,
+ seconds || 0,
+ 0,
);
+
+ field.onChange(newDate);
} catch (error) {
console.error(error);
}
diff --git a/apps/dashboard/src/components/forms/status-report/form.tsx b/apps/dashboard/src/components/forms/status-report/form.tsx
index 63a6ddc4d..1c8b04aa7 100644
--- a/apps/dashboard/src/components/forms/status-report/form.tsx
+++ b/apps/dashboard/src/components/forms/status-report/form.tsx
@@ -1,5 +1,9 @@
"use client";
+import {
+ EmptyStateContainer,
+ EmptyStateTitle,
+} from "@/components/content/empty-state";
import { ProcessMessage } from "@/components/content/process-message";
import {
FormCardContent,
@@ -209,7 +213,17 @@ export function FormStatusReport({
<Calendar
mode="single"
selected={field.value}
- onSelect={field.onChange}
+ onSelect={(selectedDate) => {
+ if (!selectedDate) return;
+ const newDate = new Date(selectedDate);
+ newDate.setHours(
+ field.value.getHours(),
+ field.value.getMinutes(),
+ field.value.getSeconds(),
+ field.value.getMilliseconds(),
+ );
+ field.onChange(newDate);
+ }}
disabled={(date) =>
date > new Date() || date < new Date("1900-01-01")
}
@@ -225,17 +239,28 @@ export function FormStatusReport({
id="time"
type="time"
step="1"
- defaultValue="12:00:00"
+ defaultValue={new Date()
+ .toTimeString()
+ .slice(0, 8)}
className="peer appearance-none ps-9 [&::-webkit-calendar-picker-indicator]:hidden [&::-webkit-calendar-picker-indicator]:appearance-none"
onChange={(e) => {
try {
- const date = field.value
- ?.toISOString()
- .split("T")[0];
+ const timeValue = e.target.value;
+ if (!timeValue || !field.value) return;
+
+ const [hours, minutes, seconds] = timeValue
+ .split(":")
+ .map(Number);
- field.onChange(
- new Date(`${date}T${e.target.value}`),
+ const newDate = new Date(field.value);
+ newDate.setHours(
+ hours,
+ minutes,
+ seconds || 0,
+ 0,
);
+
+ field.onChange(newDate);
} catch (error) {
console.error(error);
}
@@ -303,39 +328,45 @@ export function FormStatusReport({
<FormDescription>
Select the monitors you want to notify.
</FormDescription>
- <div className="grid gap-3">
- <div className="flex items-center gap-2">
- <FormControl>
- <Checkbox
- id="all"
- checked={field.value?.length === monitors.length}
- onCheckedChange={(checked) => {
- field.onChange(
- checked ? monitors.map((m) => m.id) : [],
- );
- }}
- />
- </FormControl>
- <Label htmlFor="all">Select all</Label>
- </div>
- {monitors.map((item) => (
- <div key={item.id} className="flex items-center gap-2">
+ {monitors.length ? (
+ <div className="grid gap-3">
+ <div className="flex items-center gap-2">
<FormControl>
<Checkbox
- id={String(item.id)}
- checked={field.value?.includes(item.id)}
+ id="all"
+ checked={field.value?.length === monitors.length}
onCheckedChange={(checked) => {
- const newValue = checked
- ? [...(field.value || []), item.id]
- : field.value?.filter((id) => id !== item.id);
- field.onChange(newValue);
+ field.onChange(
+ checked ? monitors.map((m) => m.id) : [],
+ );
}}
/>
</FormControl>
- <Label htmlFor={String(item.id)}>{item.name}</Label>
+ <Label htmlFor="all">Select all</Label>
</div>
- ))}
- </div>
+ {monitors.map((item) => (
+ <div key={item.id} className="flex items-center gap-2">
+ <FormControl>
+ <Checkbox
+ id={String(item.id)}
+ checked={field.value?.includes(item.id)}
+ onCheckedChange={(checked) => {
+ const newValue = checked
+ ? [...(field.value || []), item.id]
+ : field.value?.filter((id) => id !== item.id);
+ field.onChange(newValue);
+ }}
+ />
+ </FormControl>
+ <Label htmlFor={String(item.id)}>{item.name}</Label>
+ </div>
+ ))}
+ </div>
+ ) : (
+ <EmptyStateContainer>
+ <EmptyStateTitle>No monitors found</EmptyStateTitle>
+ </EmptyStateContainer>
+ )}
<FormMessage />
</FormItem>
)}