Skip to content

Open-source status page, incident response and uptime monitoring

chore: get next report update status (#1836)

Maximilian Kaske441e4594fecd
diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
index ae7ee9dd4..4e2d01e39 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
@@ -17,6 +17,7 @@ import { FormSheetWithDirtyProtection } from "@/components/forms/form-sheet";
import type { FormValues } from "@/components/forms/status-report-update/form";
import { FormStatusReportUpdateCard } from "@/components/forms/status-report-update/form-status-report";
import { FormSheetStatusReportUpdate } from "@/components/forms/status-report-update/sheet";
+import { getNextStatus } from "@/data/status-report-updates.client";
import { useTRPC } from "@/lib/trpc/client";
import { Button } from "@openstatus/ui/components/ui/button";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
@@ -87,6 +88,9 @@ export default function Page() {
<EmptyStateContainer className="my-8 border-dashed">
<EmptyStateDescription>Status Page Report</EmptyStateDescription>
<FormSheetStatusReportUpdate
+ defaultValues={{
+ status: getNextStatus(statusReport.status),
+ }}
onSubmit={async (values: FormValues) => {
await createStatusReportUpdateMutation.mutateAsync({
statusReportId: statusReport.id,
diff --git a/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx b/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
index 4baf9ce35..87aece28a 100644
--- a/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
+++ b/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
@@ -4,7 +4,7 @@ import { ProcessMessage } from "@/components/content/process-message";
import { TableCellDate } from "@/components/data-table/table-cell-date";
import { FormSheetStatusReportUpdate } from "@/components/forms/status-report-update/sheet";
import { icons } from "@/data/icons";
-import { colors } from "@/data/status-report-updates.client";
+import { colors, getNextStatus } from "@/data/status-report-updates.client";
import { useTRPC } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import type { RouterOutputs } from "@openstatus/api";
@@ -82,6 +82,9 @@ export function DataTable({
<TooltipProvider>
<Tooltip>
<FormSheetStatusReportUpdate
+ defaultValues={{
+ status: getNextStatus(updates[updates.length - 1].status),
+ }}
onSubmit={async (values) => {
await createStatusReportUpdateMutation.mutateAsync({
statusReportId: reportId,
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 ba10faf5c..16bb36f5e 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
@@ -3,6 +3,7 @@
import { QuickActions } from "@/components/dropdowns/quick-actions";
import { FormSheetStatusReportUpdate } from "@/components/forms/status-report-update/sheet";
import { FormSheetStatusReport } from "@/components/forms/status-report/sheet";
+import { getNextStatus } from "@/data/status-report-updates.client";
import { getActions } from "@/data/status-reports.client";
import { useTRPC } from "@/lib/trpc/client";
import type { RouterOutputs } from "@openstatus/api";
@@ -143,6 +144,9 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
</button>
</FormSheetStatusReport>
<FormSheetStatusReportUpdate
+ defaultValues={{
+ status: getNextStatus(row.original.status),
+ }}
onSubmit={async (values) => {
await createStatusReportUpdateMutation.mutateAsync({
statusReportId: row.original.id,
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 9d2e5acef..092b9ee7b 100644
--- a/apps/dashboard/src/components/forms/status-report-update/form.tsx
+++ b/apps/dashboard/src/components/forms/status-report-update/form.tsx
@@ -66,7 +66,7 @@ export function FormStatusReportUpdate({
className,
...props
}: Omit<React.ComponentProps<"form">, "onSubmit"> & {
- defaultValues?: FormValues;
+ defaultValues?: Partial<FormValues>;
onSubmit: (values: FormValues) => Promise<void>;
}) {
const trpc = useTRPC();
@@ -77,11 +77,11 @@ export function FormStatusReportUpdate({
const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
const form = useForm<FormValues>({
resolver: zodResolver(schema),
- defaultValues: defaultValues ?? {
- status: "identified",
- message: "",
- date: new Date(),
- notifySubscribers: true,
+ defaultValues: {
+ status: defaultValues?.status ?? "identified",
+ message: defaultValues?.message ?? "",
+ date: defaultValues?.date ?? new Date(),
+ notifySubscribers: defaultValues?.notifySubscribers ?? true,
},
});
const watchMessage = form.watch("message");
diff --git a/apps/dashboard/src/components/forms/status-report-update/sheet.tsx b/apps/dashboard/src/components/forms/status-report-update/sheet.tsx
index 2f19a3163..871c11f72 100644
--- a/apps/dashboard/src/components/forms/status-report-update/sheet.tsx
+++ b/apps/dashboard/src/components/forms/status-report-update/sheet.tsx
@@ -22,7 +22,7 @@ export function FormSheetStatusReportUpdate({
defaultValues,
onSubmit,
}: Omit<React.ComponentProps<typeof FormSheetTrigger>, "onSubmit"> & {
- defaultValues?: FormValues;
+ defaultValues?: Partial<FormValues>;
onSubmit: (values: FormValues) => Promise<void>;
}) {
const [open, setOpen] = useState(false);
diff --git a/apps/dashboard/src/data/status-report-updates.client.ts b/apps/dashboard/src/data/status-report-updates.client.ts
index 37bf3331e..c156dddcb 100644
--- a/apps/dashboard/src/data/status-report-updates.client.ts
+++ b/apps/dashboard/src/data/status-report-updates.client.ts
@@ -39,3 +39,23 @@ export const colors = {
identified:
"text-warning/80 data-[state=selected]:bg-warning/10 data-[state=selected]:text-warning",
} as const satisfies Record<StatusReportStatus, string>;
+
+/**
+ * Get the next status in the progression:
+ * investigating → identified → monitoring → resolved
+ *
+ * @param currentStatus - The current status
+ * @returns The next status in the progression, or 'resolved' if already at the end, or 'investigating' for invalid statuses
+ */
+export function getNextStatus(currentStatus: string): StatusReportStatus {
+ const statusProgression: Record<StatusReportStatus, StatusReportStatus> = {
+ investigating: "identified",
+ identified: "monitoring",
+ monitoring: "resolved",
+ resolved: "resolved",
+ };
+
+ return (
+ statusProgression[currentStatus as StatusReportStatus] ?? "investigating"
+ );
+}