Skip to content

Open-source status page, incident response and uptime monitoring

chore: feedback probo (#1525)

Maximilian Kaske7aefd4323513
diff --git a/apps/dashboard/src/components/data-table/maintenances/columns.tsx b/apps/dashboard/src/components/data-table/maintenances/columns.tsx
index cb405916a..839181c19 100644
--- a/apps/dashboard/src/components/data-table/maintenances/columns.tsx
+++ b/apps/dashboard/src/components/data-table/maintenances/columns.tsx
@@ -1,6 +1,7 @@
"use client";
import { ProcessMessage } from "@/components/content/process-message";
+import { TableCellDate } from "@/components/data-table/table-cell-date";
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";
@@ -39,18 +40,7 @@ export const columns: ColumnDef<Maintenance>[] = [
header: ({ column }) => (
<DataTableColumnHeader column={column} title="Start Date" />
),
- cell: ({ row }) => {
- const value = row.getValue("from");
- if (value instanceof Date) {
- return (
- <div className="text-muted-foreground">{value.toLocaleString()}</div>
- );
- }
- if (typeof value === "string") {
- return <div className="text-muted-foreground">{value}</div>;
- }
- return <div className="text-muted-foreground">-</div>;
- },
+ cell: ({ row }) => <TableCellDate value={row.getValue("from")} />,
enableHiding: false,
},
{
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 f0e18b894..54f46797f 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
@@ -1,6 +1,7 @@
"use client";
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 { Button } from "@/components/ui/button";
import {
@@ -116,7 +117,7 @@ export function DataTable({
</div>
</TableCell>
<TableCell className="w-[170px] text-muted-foreground">
- {update.date.toLocaleString()}
+ <TableCellDate value={update.date} />
</TableCell>
<TableCell className="w-8">
<DataTableRowActions row={update} />
diff --git a/apps/dashboard/src/components/data-table/table-cell-date.tsx b/apps/dashboard/src/components/data-table/table-cell-date.tsx
index e53914206..e105ec8cf 100644
--- a/apps/dashboard/src/components/data-table/table-cell-date.tsx
+++ b/apps/dashboard/src/components/data-table/table-cell-date.tsx
@@ -1,3 +1,4 @@
+import { HoverCardTimestamp } from "@/components/common/hover-card-timestamp";
import { cn } from "@/lib/utils";
import { format } from "date-fns";
@@ -9,9 +10,11 @@ export function TableCellDate({
}: React.ComponentProps<"div"> & { value: unknown; formatStr?: string }) {
if (value instanceof Date) {
return (
- <div className={cn("text-muted-foreground", className)} {...props}>
- {format(value, formatStr)}
- </div>
+ <HoverCardTimestamp date={value}>
+ <div className={cn("text-muted-foreground", className)} {...props}>
+ {format(value, formatStr)}
+ </div>
+ </HoverCardTimestamp>
);
}
if (typeof value === "string") {
diff --git a/apps/dashboard/src/components/forms/maintenance/form.tsx b/apps/dashboard/src/components/forms/maintenance/form.tsx
index a3aeff075..aff58ea45 100644
--- a/apps/dashboard/src/components/forms/maintenance/form.tsx
+++ b/apps/dashboard/src/components/forms/maintenance/form.tsx
@@ -71,6 +71,7 @@ export function FormMaintenance({
onSubmit: (values: FormValues) => Promise<void>;
}) {
const mobile = useIsMobile();
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
const form = useForm<FormValues>({
resolver: zodResolver(schema),
defaultValues: defaultValues ?? {
@@ -81,6 +82,7 @@ export function FormMaintenance({
monitors: [],
},
});
+ const watchEndDate = form.watch("endDate");
const watchMessage = form.watch("message");
const [isPending, startTransition] = useTransition();
const { setIsDirty } = useFormSheetDirty();
@@ -184,17 +186,22 @@ export function FormMaintenance({
field.value.getMilliseconds(),
);
field.onChange(newDate);
+
+ // NOTE: if end date is before start date, set it to the same day as the start date
+ if (watchEndDate && newDate > watchEndDate) {
+ form.setValue("endDate", newDate);
+ }
}}
initialFocus
/>
<div className="border-t p-3">
<div className="flex items-center gap-3">
- <Label htmlFor="time" className="text-xs">
+ <Label htmlFor="time-start" className="text-xs">
Enter time
</Label>
<div className="relative grow">
<Input
- id="time"
+ id="time-start"
type="time"
step="1"
value={
@@ -234,7 +241,17 @@ export function FormMaintenance({
</div>
</PopoverContent>
</Popover>
- <FormDescription>When the maintenance starts.</FormDescription>
+ <FormDescription>
+ When the maintenance starts. Shown in your timezone (
+ <code className="font-commit-mono text-foreground/70">
+ {timezone}
+ </code>
+ ) and saved as Unix time (
+ <code className="font-commit-mono text-foreground/70">
+ UTC
+ </code>
+ ).
+ </FormDescription>
<FormMessage />
</FormItem>
)}
@@ -293,12 +310,12 @@ export function FormMaintenance({
/>
<div className="border-t p-3">
<div className="flex items-center gap-3">
- <Label htmlFor="time" className="text-xs">
+ <Label htmlFor="time-end" className="text-xs">
Enter time
</Label>
<div className="relative grow">
<Input
- id="time"
+ id="time-end"
type="time"
step="1"
value={
@@ -338,7 +355,17 @@ export function FormMaintenance({
</div>
</PopoverContent>
</Popover>
- <FormDescription>When the maintenance ends.</FormDescription>
+ <FormDescription>
+ When the maintenance ends. Shown in your timezone (
+ <code className="font-commit-mono text-foreground/70">
+ {timezone}
+ </code>
+ ) and saved as Unix time (
+ <code className="font-commit-mono text-foreground/70">
+ UTC
+ </code>
+ ).
+ </FormDescription>
<FormMessage />
</FormItem>
)}
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 217f16572..38aebeeb9 100644
--- a/apps/dashboard/src/components/forms/status-report-update/form.tsx
+++ b/apps/dashboard/src/components/forms/status-report-update/form.tsx
@@ -63,6 +63,7 @@ export function FormStatusReportUpdate({
onSubmit: (values: FormValues) => Promise<void>;
}) {
const mobile = useIsMobile();
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
const form = useForm<FormValues>({
resolver: zodResolver(schema),
defaultValues: defaultValues ?? {
@@ -245,7 +246,15 @@ export function FormStatusReportUpdate({
</PopoverContent>
</Popover>
<FormDescription>
- When the status report was created.
+ When the status report was created. Shown in your timezone (
+ <code className="font-commit-mono text-foreground/70">
+ {timezone}
+ </code>
+ ) and saved as Unix time (
+ <code className="font-commit-mono text-foreground/70">
+ UTC
+ </code>
+ ).
</FormDescription>
<FormMessage />
</FormItem>
diff --git a/apps/dashboard/src/components/forms/status-report/form.tsx b/apps/dashboard/src/components/forms/status-report/form.tsx
index 3b11c3315..32bed6463 100644
--- a/apps/dashboard/src/components/forms/status-report/form.tsx
+++ b/apps/dashboard/src/components/forms/status-report/form.tsx
@@ -80,6 +80,7 @@ export function FormStatusReport({
monitors: { id: number; name: string }[];
}) {
const mobile = useIsMobile();
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
const form = useForm<FormValues>({
resolver: zodResolver(defaultValues ? updateSchema : schema),
defaultValues: defaultValues ?? {
@@ -284,7 +285,16 @@ export function FormStatusReport({
</PopoverContent>
</Popover>
<FormDescription>
- When the status report was created.
+ When the status report was created. Shown in your timezone
+ (
+ <code className="font-commit-mono text-foreground/70">
+ {timezone}
+ </code>
+ ) and saved as Unix time (
+ <code className="font-commit-mono text-foreground/70">
+ UTC
+ </code>
+ ).
</FormDescription>
<FormMessage />
</FormItem>
diff --git a/apps/status-page/package.json b/apps/status-page/package.json
index de114fa8a..8d4a9e28b 100644
--- a/apps/status-page/package.json
+++ b/apps/status-page/package.json
@@ -75,6 +75,7 @@
"clsx": "2.1.1",
"cmdk": "1.1.1",
"date-fns": "4.1.0",
+ "feed": "4.2.2",
"lucide-react": "0.525.0",
"next": "15.5.3",
"next-auth": "5.0.0-beta.29",
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/feed/[type]/route.ts b/apps/status-page/src/app/(status-page)/[domain]/(public)/feed/[type]/route.ts
new file mode 100644
index 000000000..ec2ae9d97
--- /dev/null
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/feed/[type]/route.ts
@@ -0,0 +1,102 @@
+import { getBaseUrl } from "@/lib/base-url";
+import { getQueryClient, trpc } from "@/lib/trpc/server";
+import { Feed } from "feed";
+import { notFound, unauthorized } from "next/navigation";
+
+const STATUS_LABELS = {
+ investigating: "Investigating",
+ identified: "Identified",
+ monitoring: "Monitoring",
+ resolved: "Resolved",
+ maintenance: "Maintenance",
+} as const;
+
+export const revalidate = 60;
+
+export async function GET(
+ _request: Request,
+ props: { params: Promise<{ domain: string; type: string }> },
+) {
+ const queryClient = getQueryClient();
+ const { domain, type } = await props.params;
+ if (!["rss", "atom"].includes(type)) return notFound();
+
+ const page = await queryClient.fetchQuery(
+ trpc.page.getPageBySlug.queryOptions({ slug: domain }),
+ );
+ if (!page) return notFound();
+ if (page.passwordProtected) return unauthorized();
+
+ const baseUrl = getBaseUrl({
+ slug: page.slug,
+ customDomain: page.customDomain,
+ });
+
+ const feed = new Feed({
+ id: `${baseUrl}/feed/${type}`,
+ title: page.title,
+ description: page.description,
+ generator: "OpenStatus - Status Page Updates",
+ feedLinks: {
+ rss: `${baseUrl}/feed/rss`,
+ atom: `${baseUrl}/feed/atom`,
+ },
+ link: baseUrl,
+ author: {
+ name: page.title,
+ email:
+ page.contactUrl?.startsWith("mailto:") && page.contactUrl !== null
+ ? page.contactUrl.slice(7)
+ : undefined,
+ link: page.homepageUrl || baseUrl,
+ },
+ copyright: `Copyright ${new Date()
+ .getFullYear()
+ .toString()} openstatus.dev`,
+ language: "en-US",
+ updated: new Date(),
+ ttl: 60,
+ });
+
+ for (const maintenance of page.maintenances) {
+ const maintenanceUrl = `${baseUrl}/events/maintenance/${maintenance.id}`;
+ feed.addItem({
+ id: maintenanceUrl,
+ title: `Maintenance - ${maintenance.title}`,
+ link: maintenanceUrl,
+ description: maintenance.message,
+ date: maintenance.updatedAt ?? maintenance.createdAt ?? new Date(),
+ });
+ }
+
+ for (const statusReport of page.statusReports) {
+ const statusReportUrl = `${baseUrl}/events/report/${statusReport.id}`;
+ const status = STATUS_LABELS[statusReport.status];
+ const statusReportUpdates = statusReport.statusReportUpdates
+ .map((update) => {
+ const updateStatus = STATUS_LABELS[update.status];
+ return `${updateStatus}: ${update.message}.`;
+ })
+ .join("\n\n");
+
+ feed.addItem({
+ id: statusReportUrl,
+ title: `${status} - ${statusReport.title}`,
+ link: statusReportUrl,
+ description: statusReportUpdates,
+ date: statusReport.updatedAt ?? statusReport.createdAt ?? new Date(),
+ });
+ }
+
+ feed.items.sort(
+ (a, b) => (a.date as Date).getTime() - (b.date as Date).getTime(),
+ );
+
+ const res = type === "atom" ? feed.atom1() : feed.rss2();
+
+ return new Response(res, {
+ headers: {
+ "Content-Type": "application/xml; charset=utf-8",
+ },
+ });
+}
diff --git a/apps/status-page/src/components/nav/header.tsx b/apps/status-page/src/components/nav/header.tsx
index b8ab42eaf..d19ffb079 100644
--- a/apps/status-page/src/components/nav/header.tsx
+++ b/apps/status-page/src/components/nav/header.tsx
@@ -118,7 +118,7 @@ export function Header(props: React.ComponentProps<"header">) {
onSubscribe={async (email) => {
await subscribeMutation.mutateAsync({ slug: domain, email });
}}
- slug={page?.slug}
+ page={page}
/>
<NavMobile className="md:hidden" />
</div>
diff --git a/apps/status-page/src/components/status-page/status-updates.tsx b/apps/status-page/src/components/status-page/status-updates.tsx
index 70504a4c1..8b6984105 100644
--- a/apps/status-page/src/components/status-page/status-updates.tsx
+++ b/apps/status-page/src/components/status-page/status-updates.tsx
@@ -11,28 +11,36 @@ import {
import { Separator } from "@/components/ui/separator";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { useCopyToClipboard } from "@/hooks/use-copy-to-clipboard";
+import { getBaseUrl } from "@/lib/base-url";
import { cn } from "@/lib/utils";
+import type { RouterOutputs } from "@openstatus/api";
import { Check, Copy, Inbox } from "lucide-react";
import { useState } from "react";
type StatusUpdateType = "email" | "rss" | "ssh";
+type Page = NonNullable<RouterOutputs["statusPage"]["get"]>;
+
// TODO: use domain instead of openstatus subdomain if available
interface StatusUpdatesProps extends React.ComponentProps<typeof Button> {
types?: StatusUpdateType[];
- slug?: string;
+ page?: Page | null;
onSubscribe?: (value: string) => Promise<void> | void;
}
export function StatusUpdates({
className,
types = ["rss", "ssh"],
- slug,
+ page,
onSubscribe,
...props
}: StatusUpdatesProps) {
const [success, setSuccess] = useState(false);
+ const baseUrl = getBaseUrl({
+ slug: page?.slug,
+ customDomain: page?.customDomain,
+ });
return (
<Popover>
@@ -91,7 +99,7 @@ export function StatusUpdates({
<CopyInputButton
className="w-full"
id="rss"
- value={`https://${slug}.openstatus.dev/feed/rss`}
+ value={`${baseUrl}/feed/rss`}
/>
</div>
<Separator />
@@ -100,7 +108,7 @@ export function StatusUpdates({
<CopyInputButton
className="w-full"
id="atom"
- value={`https://${slug}.openstatus.dev/feed/atom`}
+ value={`${baseUrl}/feed/atom`}
/>
</div>
</TabsContent>
@@ -110,7 +118,7 @@ export function StatusUpdates({
<CopyInputButton
className="w-full"
id="ssh"
- value={`ssh ${slug}@ssh.openstatus.dev`}
+ value={`ssh ${page?.slug}@ssh.openstatus.dev`}
/>
</div>
</TabsContent>
diff --git a/apps/status-page/src/lib/base-url.ts b/apps/status-page/src/lib/base-url.ts
new file mode 100644
index 000000000..08decb89c
--- /dev/null
+++ b/apps/status-page/src/lib/base-url.ts
@@ -0,0 +1,15 @@
+export function getBaseUrl({
+ slug,
+ customDomain,
+}: {
+ slug?: string;
+ customDomain?: string;
+}) {
+ if (process.env.NODE_ENV === "development") {
+ return `http://localhost:3000/${slug}`;
+ }
+ if (customDomain) {
+ return `https://${customDomain}`;
+ }
+ return `https://${slug}.openstatus.dev`;
+}
diff --git a/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx b/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx
index d3c7c470c..25593371a 100644
--- a/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx
+++ b/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx
@@ -45,7 +45,7 @@ import {
} from "@/components/ping-response-analysis/utils";
import { toast } from "@/lib/toast";
import { notEmpty } from "@/lib/utils";
-import { monitorRegions } from "@openstatus/db/src/schema/constants";
+import { AVAILABLE_REGIONS } from "@openstatus/regions";
import { regionDict } from "@openstatus/regions";
import { ArrowRight, ChevronRight, Gauge, Info, Loader } from "lucide-react";
import dynamic from "next/dynamic";
@@ -311,7 +311,7 @@ function TableResult({
<p className="w-[95px]">
Region{" "}
<span className="font-normal text-xs tabular-nums">
- ({result.length}/{monitorRegions.length})
+ ({result.length}/{AVAILABLE_REGIONS.length})
</span>
</p>
{loading ? (
@@ -322,7 +322,7 @@ function TableResult({
{id &&
!loading &&
result.length > 0 &&
- result.length !== monitorRegions.length ? (
+ result.length !== AVAILABLE_REGIONS.length ? (
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 46ff391b0..db86b8ae0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -702,6 +702,9 @@ importers:
date-fns:
specifier: 4.1.0
version: 4.1.0
+ feed:
+ specifier: 4.2.2
+ version: 4.2.2
lucide-react:
specifier: 0.525.0
version: 0.525.0([email protected])