Skip to content

Open-source status page, incident response and uptime monitoring

Status Report Updates Not Refreshing in Server Components (#1717)

Moulik Aggarwal01089f747510
diff --git a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx b/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
index affb067cb..b45ea3ff2 100644
--- a/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
+++ b/apps/dashboard/src/app/(dashboard)/overview/layout.tsx
@@ -5,22 +5,47 @@ import {
} from "@/components/nav/app-header";
import { AppSidebarTrigger } from "@/components/nav/app-sidebar";
+import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
import { Breadcrumb } from "./breadcrumb";
import { NavActions } from "./nav-actions";
-export default function Layout({ children }: { children: React.ReactNode }) {
+export default async function Layout({
+ children,
+}: { children: React.ReactNode }) {
+ const queryClient = getQueryClient();
+
+ await queryClient.prefetchQuery(trpc.monitor.list.queryOptions());
+ await queryClient.prefetchQuery(trpc.page.list.queryOptions());
+ await queryClient.prefetchQuery(
+ trpc.incident.list.queryOptions({
+ period: "7d",
+ }),
+ );
+ await queryClient.prefetchQuery(
+ trpc.statusReport.list.queryOptions({
+ period: "7d",
+ }),
+ );
+ await queryClient.prefetchQuery(
+ trpc.maintenance.list.queryOptions({
+ period: "7d",
+ }),
+ );
+
return (
- <div>
- <AppHeader>
- <AppHeaderContent>
- <AppSidebarTrigger />
- <Breadcrumb />
- </AppHeaderContent>
- <AppHeaderActions>
- <NavActions />
- </AppHeaderActions>
- </AppHeader>
- <main className="w-full flex-1">{children}</main>
- </div>
+ <HydrateClient>
+ <div>
+ <AppHeader>
+ <AppHeaderContent>
+ <AppSidebarTrigger />
+ <Breadcrumb />
+ </AppHeaderContent>
+ <AppHeaderActions>
+ <NavActions />
+ </AppHeaderActions>
+ </AppHeader>
+ <main className="w-full flex-1">{children}</main>
+ </div>
+ </HydrateClient>
);
}
diff --git a/apps/dashboard/src/app/(dashboard)/overview/page.tsx b/apps/dashboard/src/app/(dashboard)/overview/page.tsx
index fe064bf68..ca84641a0 100644
--- a/apps/dashboard/src/app/(dashboard)/overview/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/overview/page.tsx
@@ -1,3 +1,5 @@
+"use client";
+
import {
SectionDescription,
SectionGroup,
@@ -21,8 +23,9 @@ import {
MetricCardValue,
} from "@/components/metric/metric-card";
import { DataTable } from "@/components/ui/data-table/data-table";
-import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
+import { useTRPC } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
+import { useQuery } from "@tanstack/react-query";
import { formatDistanceToNowStrict } from "date-fns";
import { List, Search } from "lucide-react";
import { Terminal } from "lucide-react";
@@ -33,38 +36,30 @@ import { DataTableStatusReports } from "./data-table-status-reports";
// whenever I change the maintenances, the page is not updated
// we need to move the queryClient to the layout and prefetch the data there
-export default async function Page() {
- const queryClient = getQueryClient();
+export default function Page() {
+ const trpc = useTRPC();
- const monitors = await queryClient.fetchQuery(
- trpc.monitor.list.queryOptions(),
- );
- const pages = await queryClient.fetchQuery(trpc.page.list.queryOptions());
- const incidents = await queryClient.fetchQuery(
+ const { data: monitors } = useQuery(trpc.monitor.list.queryOptions());
+ const { data: pages } = useQuery(trpc.page.list.queryOptions());
+ const { data: incidents } = useQuery(
trpc.incident.list.queryOptions({
- order: "desc",
- startedAt: {
- gte: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000), // 7 days ago
- },
+ period: "7d",
}),
);
- const statusReports = await queryClient.fetchQuery(
+ const { data: statusReports } = useQuery(
trpc.statusReport.list.queryOptions({
- order: "desc",
- createdAt: {
- gte: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000), // 7 days ago
- },
+ period: "7d",
}),
);
- const maintenances = await queryClient.fetchQuery(
+ const { data: maintenances } = useQuery(
trpc.maintenance.list.queryOptions({
- order: "desc",
- createdAt: {
- gte: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000), // 7 days ago
- },
+ period: "7d",
}),
);
+ if (!monitors || !pages || !incidents || !statusReports || !maintenances)
+ return null;
+
const lastIncident = incidents.length > 0 ? incidents[0] : null;
const lastStatusReport = statusReports.length > 0 ? statusReports[0] : null;
const lastMaintenance = maintenances.length > 0 ? maintenances[0] : null;
@@ -135,89 +130,85 @@ export default async function Page() {
];
return (
- <HydrateClient>
- <SectionGroup>
- <Note>
- <Terminal />
- Use Monitoring as Code to manage your monitors with our CLI.
- <NoteButton variant="default" asChild>
- <Link href="/cli">Learn more</Link>
- </NoteButton>
- </Note>
- <Section>
- <SectionHeader>
- <SectionTitle>Overview</SectionTitle>
- <SectionDescription>
- Welcome to your OpenStatus dashboard.
- </SectionDescription>
- </SectionHeader>
- <MetricCardGroup>
- {metrics.map((metric) => (
- <Link
- href={metric.href}
- key={metric.title}
- className={cn(metric.disabled && "pointer-events-none")}
- aria-disabled={metric.disabled}
- >
- <MetricCard variant={metric.variant}>
- <MetricCardHeader className="flex items-center justify-between gap-2">
- <MetricCardTitle className="truncate">
- {metric.title}
- </MetricCardTitle>
- <metric.icon className="size-4" />
- </MetricCardHeader>
- <MetricCardValue>{metric.value}</MetricCardValue>
- </MetricCard>
- </Link>
- ))}
- </MetricCardGroup>
- </Section>
- <Section>
- <SectionHeader>
- <SectionTitle>Incidents</SectionTitle>
- <SectionDescription>
- Incidents over the last 7 days.
- </SectionDescription>
- </SectionHeader>
- {incidents.length > 0 ? (
- <DataTable columns={incidentsColumns} data={incidents} />
- ) : (
- <EmptyStateContainer>
- <EmptyStateTitle>No incidents found</EmptyStateTitle>
- </EmptyStateContainer>
- )}
- </Section>
- <Section>
- <SectionHeader>
- <SectionTitle>Reports</SectionTitle>
- <SectionDescription>
- Reports over the last 7 days.
- </SectionDescription>
- </SectionHeader>
- {statusReports.length > 0 ? (
- <DataTableStatusReports statusReports={statusReports} />
- ) : (
- <EmptyStateContainer>
- <EmptyStateTitle>No reports found</EmptyStateTitle>
- </EmptyStateContainer>
- )}
- </Section>
- <Section>
- <SectionHeader>
- <SectionTitle>Maintenance</SectionTitle>
- <SectionDescription>
- Maintenance over the last 7 days.
- </SectionDescription>
- </SectionHeader>
- {maintenances.length > 0 ? (
- <DataTable columns={maintenancesColumns} data={maintenances} />
- ) : (
- <EmptyStateContainer>
- <EmptyStateTitle>No maintenances found</EmptyStateTitle>
- </EmptyStateContainer>
- )}
- </Section>
- </SectionGroup>
- </HydrateClient>
+ <SectionGroup>
+ <Note>
+ <Terminal />
+ Use Monitoring as Code to manage your monitors with our CLI.
+ <NoteButton variant="default" asChild>
+ <Link href="/cli">Learn more</Link>
+ </NoteButton>
+ </Note>
+ <Section>
+ <SectionHeader>
+ <SectionTitle>Overview</SectionTitle>
+ <SectionDescription>
+ Welcome to your OpenStatus dashboard.
+ </SectionDescription>
+ </SectionHeader>
+ <MetricCardGroup>
+ {metrics.map((metric) => (
+ <Link
+ href={metric.href}
+ key={metric.title}
+ className={cn(metric.disabled && "pointer-events-none")}
+ aria-disabled={metric.disabled}
+ >
+ <MetricCard variant={metric.variant}>
+ <MetricCardHeader className="flex items-center justify-between gap-2">
+ <MetricCardTitle className="truncate">
+ {metric.title}
+ </MetricCardTitle>
+ <metric.icon className="size-4" />
+ </MetricCardHeader>
+ <MetricCardValue>{metric.value}</MetricCardValue>
+ </MetricCard>
+ </Link>
+ ))}
+ </MetricCardGroup>
+ </Section>
+ <Section>
+ <SectionHeader>
+ <SectionTitle>Incidents</SectionTitle>
+ <SectionDescription>
+ Incidents over the last 7 days.
+ </SectionDescription>
+ </SectionHeader>
+ {incidents.length > 0 ? (
+ <DataTable columns={incidentsColumns} data={incidents} />
+ ) : (
+ <EmptyStateContainer>
+ <EmptyStateTitle>No incidents found</EmptyStateTitle>
+ </EmptyStateContainer>
+ )}
+ </Section>
+ <Section>
+ <SectionHeader>
+ <SectionTitle>Reports</SectionTitle>
+ <SectionDescription>Reports over the last 7 days.</SectionDescription>
+ </SectionHeader>
+ {statusReports.length > 0 ? (
+ <DataTableStatusReports statusReports={statusReports} />
+ ) : (
+ <EmptyStateContainer>
+ <EmptyStateTitle>No reports found</EmptyStateTitle>
+ </EmptyStateContainer>
+ )}
+ </Section>
+ <Section>
+ <SectionHeader>
+ <SectionTitle>Maintenance</SectionTitle>
+ <SectionDescription>
+ Maintenance over the last 7 days.
+ </SectionDescription>
+ </SectionHeader>
+ {maintenances.length > 0 ? (
+ <DataTable columns={maintenancesColumns} data={maintenances} />
+ ) : (
+ <EmptyStateContainer>
+ <EmptyStateTitle>No maintenances found</EmptyStateTitle>
+ </EmptyStateContainer>
+ )}
+ </Section>
+ </SectionGroup>
);
}
diff --git a/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsx
index 3bb1d46e5..b6412711a 100644
--- a/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsx
+++ b/apps/dashboard/src/components/data-table/maintenances/data-table-row-actions.tsx
@@ -34,6 +34,11 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
pageId: row.original.pageId ?? undefined,
}),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.maintenance.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
@@ -46,6 +51,11 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
pageId: row.original.pageId ?? undefined,
}),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.maintenance.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
diff --git a/apps/dashboard/src/components/data-table/status-report-updates/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/status-report-updates/data-table-row-actions.tsx
index 32a310b2d..ed270db24 100644
--- a/apps/dashboard/src/components/data-table/status-report-updates/data-table-row-actions.tsx
+++ b/apps/dashboard/src/components/data-table/status-report-updates/data-table-row-actions.tsx
@@ -32,6 +32,11 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
queryClient.invalidateQueries({
queryKey: trpc.page.list.queryKey(),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.statusReport.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
@@ -43,6 +48,11 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
pageId: Number.parseInt(id),
}),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.statusReport.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
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 bfa28c832..036c3a9af 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
@@ -60,6 +60,11 @@ export function DataTable({
queryClient.invalidateQueries({
queryKey: trpc.page.list.queryKey(),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.statusReport.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
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 cd0ac3ffb..9117ac51a 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
@@ -57,6 +57,11 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
queryClient.invalidateQueries({
queryKey: trpc.page.list.queryKey(),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.statusReport.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
@@ -76,6 +81,11 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
queryClient.invalidateQueries({
queryKey: trpc.page.list.queryKey(),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.statusReport.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
@@ -90,6 +100,11 @@ export function DataTableRowActions({ row }: DataTableRowActionsProps) {
queryClient.invalidateQueries({
queryKey: trpc.page.list.queryKey(),
});
+ queryClient.invalidateQueries({
+ queryKey: trpc.statusReport.list.queryKey({
+ period: "7d",
+ }),
+ });
},
}),
);
diff --git a/packages/api/src/router/incident.ts b/packages/api/src/router/incident.ts
index 6d2e9201e..a3d000ff0 100644
--- a/packages/api/src/router/incident.ts
+++ b/packages/api/src/router/incident.ts
@@ -19,6 +19,7 @@ import {
import { Events } from "@openstatus/analytics";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { getPeriodDate, periods } from "./utils";
export const incidentRouter = createTRPCRouter({
// TODO: rename getIncidentsByWorkspace to make it consistent with the other methods
@@ -181,11 +182,7 @@ export const incidentRouter = createTRPCRouter({
.input(
z
.object({
- startedAt: z
- .object({
- gte: z.date().optional(),
- })
- .optional(),
+ period: z.enum(periods).optional(),
monitorId: z.number().nullish(),
order: z.enum(["asc", "desc"]).optional(),
})
@@ -196,9 +193,9 @@ export const incidentRouter = createTRPCRouter({
eq(incidentTable.workspaceId, opts.ctx.workspace.id),
];
- if (opts.input?.startedAt?.gte) {
+ if (opts.input?.period) {
whereConditions.push(
- gte(incidentTable.startedAt, opts.input.startedAt.gte),
+ gte(incidentTable.startedAt, getPeriodDate(opts.input.period)),
);
}
diff --git a/packages/api/src/router/maintenance.ts b/packages/api/src/router/maintenance.ts
index ab82a5b2b..68280b172 100644
--- a/packages/api/src/router/maintenance.ts
+++ b/packages/api/src/router/maintenance.ts
@@ -22,6 +22,7 @@ import {
import { Events } from "@openstatus/analytics";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "../trpc";
+import { getPeriodDate, periods } from "./utils";
export const maintenanceRouter = createTRPCRouter({
getById: protectedProcedure
@@ -120,11 +121,7 @@ export const maintenanceRouter = createTRPCRouter({
.input(
z
.object({
- createdAt: z
- .object({
- gte: z.date().optional(),
- })
- .optional(),
+ period: z.enum(periods).optional(),
pageId: z.number().optional(),
order: z.enum(["asc", "desc"]).optional(),
})
@@ -135,9 +132,9 @@ export const maintenanceRouter = createTRPCRouter({
eq(maintenance.workspaceId, opts.ctx.workspace.id),
];
- if (opts.input?.createdAt?.gte) {
+ if (opts.input?.period) {
whereConditions.push(
- gte(maintenance.createdAt, opts.input.createdAt.gte),
+ gte(maintenance.createdAt, getPeriodDate(opts.input.period)),
);
}
diff --git a/packages/api/src/router/statusReport.ts b/packages/api/src/router/statusReport.ts
index e7d543793..d2aaadd45 100644
--- a/packages/api/src/router/statusReport.ts
+++ b/packages/api/src/router/statusReport.ts
@@ -31,6 +31,7 @@ import {
import { Events } from "@openstatus/analytics";
import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
+import { getPeriodDate, periods } from "./utils";
export const statusReportRouter = createTRPCRouter({
createStatusReport: protectedProcedure
@@ -387,11 +388,7 @@ export const statusReportRouter = createTRPCRouter({
list: protectedProcedure
.input(
z.object({
- createdAt: z
- .object({
- gte: z.date().optional(),
- })
- .optional(),
+ period: z.enum(periods).optional(),
order: z.enum(["asc", "desc"]).optional(),
pageId: z.number().optional(),
}),
@@ -401,9 +398,9 @@ export const statusReportRouter = createTRPCRouter({
eq(statusReport.workspaceId, opts.ctx.workspace.id),
];
- if (opts.input?.createdAt?.gte) {
+ if (opts.input?.period) {
whereConditions.push(
- gte(statusReport.createdAt, opts.input.createdAt.gte),
+ gte(statusReport.createdAt, getPeriodDate(opts.input.period)),
);
}
diff --git a/packages/api/src/router/utils.ts b/packages/api/src/router/utils.ts
new file mode 100644
index 000000000..3a85786a1
--- /dev/null
+++ b/packages/api/src/router/utils.ts
@@ -0,0 +1,38 @@
+/**
+ * Shared utilities for API routers
+ */
+
+/**
+ * Supported time period values for filtering data
+ */
+export const periods = ["1d", "7d", "14d"] as const;
+
+/**
+ * Period type for filtering data by time range
+ */
+export type Period = (typeof periods)[number];
+
+/**
+ * Converts a period string to a Date object representing the start of that period
+ * @param period - The period to convert (e.g., "1d", "7d", "14d")
+ * @returns Date object representing the start of the period (for use with gte filters)
+ * @example
+ * // Get date for 7 days ago
+ * const date = getPeriodDate("7d");
+ * // Returns: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000)
+ */
+export function getPeriodDate(period: Period): Date {
+ const now = Date.now();
+
+ switch (period) {
+ case "1d":
+ return new Date(now - 1 * 24 * 60 * 60 * 1000);
+ case "7d":
+ return new Date(now - 7 * 24 * 60 * 60 * 1000);
+ case "14d":
+ return new Date(now - 14 * 24 * 60 * 60 * 1000);
+ default:
+ // TypeScript ensures this is exhaustive, but return 7d as safe fallback
+ return new Date(now - 7 * 24 * 60 * 60 * 1000);
+ }
+}