Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: improve status report layout (#559)
Maximilian Kaske310ff3b4d02d
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsxindex 2c93e6369..fc72cf508 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx@@ -49,7 +49,9 @@ export default async function Layout({description={page.description}actions={<Button variant="outline" asChild>- <Link href={`https://${page.slug}.openstatus.dev`}>Visit</Link>+ <Link target="_blank" href={`https://${page.slug}.openstatus.dev`}>+ Visit+ </Link></Button>}/>diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsxnew file mode 100644index 000000000..3bdb5fb55--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx@@ -0,0 +1,32 @@+import * as React from "react";+import Link from "next/link";++import { Button } from "@openstatus/ui";++import { Header } from "@/components/dashboard/header";+import { HelpCallout } from "@/components/dashboard/help-callout";+import { api } from "@/trpc/server";++export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ return (+ <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">+ <Header+ title="Status Reports"+ description="Overview of all your status reports and updates."+ actions={+ <Button asChild>+ <Link href="./status-reports/new">Create</Link>+ </Button>+ }+ />+ <div className="col-span-full">{children}</div>+ <div className="mt-8 md:mt-12">+ <HelpCallout />+ </div>+ </div>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/loading.tsxnew file mode 100644index 000000000..ae51d6a5b--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/loading.tsx@@ -0,0 +1,5 @@+import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";++export default function Loading() {+ return <DataTableSkeleton />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/page.tsxnew file mode 100644index 000000000..43e520ae5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/page.tsx@@ -0,0 +1,29 @@+import * as React from "react";+import Link from "next/link";++import { Button } from "@openstatus/ui";++import { EmptyState } from "@/components/dashboard/empty-state";+import { columns } from "@/components/data-table/status-report/columns";+import { DataTable } from "@/components/data-table/status-report/data-table";+import { api } from "@/trpc/server";++export default async function MonitorPage() {+ const reports = await api.statusReport.getStatusReportByWorkspace.query();++ if (reports?.length === 0)+ return (+ <EmptyState+ icon="siren"+ title="No status reports"+ description="Create your first status report"+ action={+ <Button asChild>+ <Link href="./status-reports/new">Create</Link>+ </Button>+ }+ />+ );++ return <DataTable columns={columns} data={reports} />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/empty-state.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/empty-state.tsxdeleted file mode 100644index db767c8b6..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/empty-state.tsx+++ /dev/null@@ -1,20 +0,0 @@-import Link from "next/link";--import { Button } from "@openstatus/ui";--import { EmptyState as DefaultEmptyState } from "@/components/dashboard/empty-state";--export function EmptyState({ id }: { id: string }) {- return (- <DefaultEmptyState- icon="megaphone"- title="No status report updates"- description="Create your first update"- action={- <Button asChild>- <Link href={`./${id}/update/edit`}>Create</Link>- </Button>- }- />- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/status-update-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/status-update-button.tsxnew file mode 100644index 000000000..0332d2ea9--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/status-update-button.tsx@@ -0,0 +1,20 @@+"use client";++import Link from "next/link";+import { usePathname } from "next/navigation";++import { Button } from "@openstatus/ui";++export function StatusUpdateButton() {+ const pathname = usePathname();++ if (pathname.endsWith("/update/edit")) {+ return <Button disabled>Status Update</Button>;+ }++ return (+ <Button asChild>+ <Link href="./update/edit">Status Update</Link>+ </Button>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/edit/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/edit/loading.tsxnew file mode 100644index 000000000..b269200de--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/edit/loading.tsx@@ -0,0 +1,5 @@+import { SkeletonForm } from "@/components/forms/skeleton-form";++export default function Loading() {+ return <SkeletonForm />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/edit/page.tsxnew file mode 100644index 000000000..53b606d48--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/edit/page.tsx@@ -0,0 +1,36 @@+import { StatusReportForm } from "@/components/forms/status-report-form";+import { api } from "@/trpc/server";++export default async function EditPage({+ params,+}: {+ params: { workspaceSlug: string; id: string };+}) {+ const statusUpdate = await api.statusReport.getStatusReportById.query({+ id: parseInt(params.id),+ });++ const monitors = await api.monitor.getMonitorsByWorkspace.query();++ const pages = await api.page.getPagesByWorkspace.query();++ return (+ <StatusReportForm+ monitors={monitors}+ pages={pages}+ defaultValues={+ // TODO: we should move the mapping to the trpc layer+ // so we don't have to do this in the UI+ // it should be something like defaultValues={statusReport}+ {+ ...statusUpdate,+ monitors: statusUpdate?.monitorsToStatusReports.map(+ ({ monitorId }) => monitorId,+ ),+ pages: statusUpdate?.pagesToStatusReports.map(({ pageId }) => pageId),+ message: "",+ }+ }+ />+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/layout.tsxnew file mode 100644index 000000000..73b9d9eb2--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/layout.tsx@@ -0,0 +1,45 @@+import { notFound } from "next/navigation";++import { Header } from "@/components/dashboard/header";+import { Navbar } from "@/components/dashboard/navbar";+import { api } from "@/trpc/server";+import { StatusUpdateButton } from "./_components/status-update-button";++export default async function Layout({+ children,+ params,+}: {+ children: React.ReactNode;+ params: { workspaceSlug: string; id: string };+}) {+ const id = params.id;++ const statusReport = await api.statusReport.getStatusReportById.query({+ id: Number(id),+ });++ if (!statusReport) {+ return notFound();+ }++ const navigation = [+ {+ label: "Overview",+ href: `/app/${params.workspaceSlug}/status-reports/${id}/overview`,+ segment: "overview",+ },+ {+ label: "Settings",+ href: `/app/${params.workspaceSlug}/status-reports/${id}/edit`,+ segment: "edit",+ },+ ];++ return (+ <div className="grid grid-cols-1 gap-6 md:gap-8">+ <Header title={statusReport.title} actions={<StatusUpdateButton />} />+ <Navbar className="col-span-full" navigation={navigation} />+ {children}+ </div>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/loading.tsxdeleted file mode 100644index 367d69d50..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/loading.tsx+++ /dev/null@@ -1,31 +0,0 @@-import { Separator, Skeleton } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";--export default function Loading() {- return (- <div className="grid gap-6 md:grid-cols-1 md:gap-8">- <div className="col-span-full flex w-full justify-between">- <Header.Skeleton withDescription={false}>- <Skeleton className="h-9 w-20" />- </Header.Skeleton>- </div>- <div className="col-span-full flex flex-col gap-6">- <div className="grid grid-cols-5 gap-3 text-sm">- <Skeleton className="col-start-1 h-5 max-w-[100px]" />- <Skeleton className="col-span-4 h-5 w-full max-w-[200px]" />- <Skeleton className="col-start-1 h-5 max-w-[100px]" />- <Skeleton className="col-span-4 h-5 w-full max-w-[100px]" />- <Skeleton className="col-start-1 h-5 max-w-[100px]" />- <div className="col-span-4 flex gap-2">- <Skeleton className="h-5 w-full max-w-[60px]" />- <Skeleton className="h-5 w-full max-w-[60px]" />- </div>- </div>- <Separator />- <Skeleton className="h-48 w-full" />- <Skeleton className="h-48 w-full" />- </div>- </div>- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/overview/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/overview/loading.tsxnew file mode 100644index 000000000..694602710--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/overview/loading.tsx@@ -0,0 +1,22 @@+import { Separator, Skeleton } from "@openstatus/ui";++export default function Loading() {+ return (+ <div className="col-span-full flex flex-col gap-6">+ <div className="grid grid-cols-5 gap-3 text-sm">+ <Skeleton className="col-start-1 h-5 max-w-[100px]" />+ <Skeleton className="col-span-4 h-5 w-full max-w-[200px]" />+ <Skeleton className="col-start-1 h-5 max-w-[100px]" />+ <Skeleton className="col-span-4 h-5 w-full max-w-[100px]" />+ <Skeleton className="col-start-1 h-5 max-w-[100px]" />+ <div className="col-span-4 flex gap-2">+ <Skeleton className="h-5 w-full max-w-[60px]" />+ <Skeleton className="h-5 w-full max-w-[60px]" />+ </div>+ </div>+ <Separator />+ <Skeleton className="h-48 w-full" />+ <Skeleton className="h-48 w-full" />+ </div>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/overview/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/overview/page.tsxnew file mode 100644index 000000000..97d17ba27--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/overview/page.tsx@@ -0,0 +1,46 @@+import * as React from "react";+import Link from "next/link";+import { notFound } from "next/navigation";++import { Button, Separator } from "@openstatus/ui";++import { EmptyState } from "@/components/dashboard/empty-state";+import { Events } from "@/components/status-update/events";+import { Summary } from "@/components/status-update/summary";+import { api } from "@/trpc/server";++export default async function OverviewPage({+ params,+}: {+ params: { workspaceSlug: string; id: string };+}) {+ const report = await api.statusReport.getStatusReportById.query({+ id: parseInt(params.id),+ });++ if (!report) return notFound();++ const monitors = report.monitorsToStatusReports.map(({ monitor }) => monitor);++ return (+ <>+ <Summary report={report} monitors={monitors} />+ <Separator />+ {report.statusReportUpdates.length > 0 ? (+ <Events statusReportUpdates={report.statusReportUpdates} editable />+ ) : (+ <EmptyState+ icon="megaphone"+ title="No status report updates"+ description="Create your first update"+ action={+ <Button asChild>+ {/* TODO: check if correct */}+ <Link href={`./${params.id}/update/edit`}>Create</Link>+ </Button>+ }+ />+ )}+ </>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/page.tsxindex ace3a316c..2265f50db 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/page.tsx@@ -1,48 +1,9 @@-import * as React from "react";-import Link from "next/link";-import { notFound } from "next/navigation";+import { redirect } from "next/navigation";-import { Button, Separator } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";-import { Events } from "@/components/status-update/events";-import { Summary } from "@/components/status-update/summary";-import { api } from "@/trpc/server";-import { EmptyState } from "./_components/empty-state";-import Loading from "./loading";--export default async function StatusReportsPage({+export default function Page({params,}: {params: { workspaceSlug: string; id: string };}) {- const report = await api.statusReport.getStatusReportById.query({- id: parseInt(params.id),- });-- if (!report) return notFound();-- const monitors = report.monitorsToStatusReports.map(({ monitor }) => monitor);-- return (- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-1 md:gap-8">- <Header- title={report.title}- actions={- <Button asChild>- <Link href={`./${params.id}/update/edit`}>Update</Link>- </Button>- }- />- <div className="col-span-full flex flex-col gap-6">- <Summary report={report} monitors={monitors} />- <Separator />- {report.statusReportUpdates.length > 0 ? (- <Events statusReportUpdates={report.statusReportUpdates} editable />- ) : (- <EmptyState id={params.id} />- )}- </div>- </div>- );+ return redirect(`./${params.id}/overview`);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/loading.tsxindex 41fdbbaa9..b269200de 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/loading.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/loading.tsx@@ -1,19 +1,5 @@-import { Skeleton } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";import { SkeletonForm } from "@/components/forms/skeleton-form";export default function Loading() {- return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">- <div className="col-span-full flex w-full justify-between">- <Header.Skeleton>- <Skeleton className="h-9 w-20" />- </Header.Skeleton>- </div>- <div className="col-span-full">- <SkeletonForm />- </div>- </div>- );+ return <SkeletonForm />;}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/page.tsxindex 5baed435c..f2b1bbc84 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/page.tsx@@ -1,7 +1,6 @@import { notFound } from "next/navigation";import * as z from "zod";-import { Header } from "@/components/dashboard/header";import { StatusReportUpdateForm } from "@/components/forms/status-report-update-form";import { api } from "@/trpc/server";@@ -34,17 +33,10 @@ export default async function EditPage({: undefined;return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">- <Header- title="Status Report Update"- description="Create a public update for your incident"- />- <div className="col-span-full">- <StatusReportUpdateForm- statusReportId={parseInt(params.id)}- defaultValues={data || undefined}- />- </div>- </div>+ <StatusReportUpdateForm+ statusReportId={parseInt(params.id)}+ defaultValues={data || undefined}+ nextUrl={"../overview"}+ />);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update.tsxindex 3107b36b1..69861ed02 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update.tsx@@ -1,3 +1,5 @@+// TODO: move to components folder as not being used in any page.tsx or layout.tsx+"use client";import * as React from "react";diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/empty-state.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/empty-state.tsxdeleted file mode 100644index 75fa4cafc..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/empty-state.tsx+++ /dev/null@@ -1,20 +0,0 @@-import Link from "next/link";--import { Button } from "@openstatus/ui";--import { EmptyState as DefaultEmptyState } from "@/components/dashboard/empty-state";--export function EmptyState() {- return (- <DefaultEmptyState- icon="siren"- title="No status reports"- description="Create your first status report"- action={- <Button asChild>- <Link href="./status-reports/edit">Create</Link>- </Button>- }- />- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/loading.tsxdeleted file mode 100644index f0a55e578..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/loading.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { Skeleton } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";-import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";--export default function Loading() {- return (- <div className="grid gap-6 md:grid-cols-1 md:gap-8">- <div className="col-span-full flex w-full justify-between">- <Header.Skeleton>- <Skeleton className="h-9 w-20" />- </Header.Skeleton>- </div>- <div className="col-span-full w-full">- <DataTableSkeleton />- </div>- </div>- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/layout.tsxnew file mode 100644index 000000000..469ad2131--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/layout.tsx@@ -0,0 +1,17 @@+import { Header } from "@/components/dashboard/header";++export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ return (+ <div className="grid gap-6 md:grid-cols-2 md:gap-8">+ <Header+ title="Status Report"+ description="Create a public report for your incident."+ />+ <div className="col-span-full">{children}</div>+ </div>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/loading.tsxnew file mode 100644index 000000000..b269200de--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/loading.tsx@@ -0,0 +1,5 @@+import { SkeletonForm } from "@/components/forms/skeleton-form";++export default function Loading() {+ return <SkeletonForm />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/page.tsxnew file mode 100644index 000000000..7fad94b07--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/page.tsx@@ -0,0 +1,14 @@+import { StatusReportForm } from "@/components/forms/status-report-form";+import { api } from "@/trpc/server";++export default async function NewPage({+ params,+}: {+ params: { workspaceSlug: string };+}) {+ const monitors = await api.monitor.getMonitorsByWorkspace.query();++ const pages = await api.page.getPagesByWorkspace.query();++ return <StatusReportForm monitors={monitors} pages={pages} nextUrl={"./"} />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/page.tsxdeleted file mode 100644index ce2b4445e..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/page.tsx+++ /dev/null@@ -1,44 +0,0 @@-import * as React from "react";-import Link from "next/link";--import { Button } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";-import { HelpCallout } from "@/components/dashboard/help-callout";-import { columns } from "@/components/data-table/status-report/columns";-import { DataTable } from "@/components/data-table/status-report/data-table";-import { api } from "@/trpc/server";-import { EmptyState } from "./_components/empty-state";--export default async function StatusReportsPage({- params,-}: {- params: { workspaceSlug: string };-}) {- const reports = await api.statusReport.getStatusReportByWorkspace.query();- return (- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-1 md:gap-8">- <Header- title="Status Reports"- description="Overview of all your status reports and updates."- actions={- <Button asChild>- <Link href="./status-reports/edit">Create</Link>- </Button>- }- />- {Boolean(reports?.length) ? (- <div className="col-span-full">- <DataTable columns={columns} data={reports} />- </div>- ) : (- <div className="col-span-full">- <EmptyState />- </div>- )}- <div className="mt-8 md:mt-12">- <HelpCallout />- </div>- </div>- );-}diff --git a/apps/web/src/components/dashboard/header.tsx b/apps/web/src/components/dashboard/header.tsxindex 39ef5907f..d2a3f2cba 100644--- a/apps/web/src/components/dashboard/header.tsx+++ b/apps/web/src/components/dashboard/header.tsx@@ -15,18 +15,20 @@ function Header({ title, description, className, actions }: HeaderProps) {return (<divclassName={cn(- "col-span-full mr-12 flex items-start justify-between lg:mr-0",+ "col-span-full mr-12 flex items-start justify-between gap-1 lg:mr-0",className,)}>- <div className="flex w-full flex-col gap-1">+ <div className="flex flex-col gap-1"><h1 className="font-cal text-3xl">{title}</h1>{description ? (<p className="text-muted-foreground">{description}</p>) : null}</div>{actions ? (- <div className="flex flex-1 items-center gap-2">{actions}</div>+ <div className="flex flex-1 items-center justify-end gap-2">+ {actions}+ </div>) : null}</div>);diff --git a/apps/web/src/components/data-table/status-report/columns.tsx b/apps/web/src/components/data-table/status-report/columns.tsxindex 67be87971..3dc4ccc75 100644--- a/apps/web/src/components/data-table/status-report/columns.tsx+++ b/apps/web/src/components/data-table/status-report/columns.tsx@@ -21,7 +21,10 @@ export const columns: ColumnDef<cell: ({ row }) => {const id = row.original.id;return (- <Link href={`./status-reports/${id}`} className="hover:underline">+ <Link+ href={`./status-reports/${id}/overview`}+ className="hover:underline"+ ><span className="truncate">{row.getValue("title")}</span></Link>);diff --git a/apps/web/src/components/data-table/status-report/data-table-row-actions.tsx b/apps/web/src/components/data-table/status-report/data-table-row-actions.tsxindex d29e1ce65..2f8dba69c 100644--- a/apps/web/src/components/data-table/status-report/data-table-row-actions.tsx+++ b/apps/web/src/components/data-table/status-report/data-table-row-actions.tsx@@ -70,10 +70,10 @@ export function DataTableRowActions<TData>({</Button></DropdownMenuTrigger><DropdownMenuContent align="end">- <Link href={`./status-reports/edit?id=${statusReport.id}`}>+ <Link href={`./status-reports/${statusReport.id}/edit`}><DropdownMenuItem>Edit</DropdownMenuItem></Link>- <Link href={`./status-reports/${statusReport.id}`}>+ <Link href={`./status-reports/${statusReport.id}/overview`}><DropdownMenuItem>View</DropdownMenuItem></Link><AlertDialogTrigger asChild>diff --git a/apps/web/src/components/forms/status-report-form.tsx b/apps/web/src/components/forms/status-report-form.tsxindex 04644dff4..b43efcd64 100644--- a/apps/web/src/components/forms/status-report-form.tsx+++ b/apps/web/src/components/forms/status-report-form.tsx@@ -52,9 +52,15 @@ interface Props {defaultValues?: InsertStatusReport;monitors?: Monitor[];pages?: Page[];+ nextUrl?: string;}-export function StatusReportForm({ defaultValues, monitors, pages }: Props) {+export function StatusReportForm({+ defaultValues,+ monitors,+ pages,+ nextUrl,+}: Props) {const form = useForm<InsertStatusReport>({resolver: zodResolver(insertStatusReportSchema),defaultValues: defaultValues@@ -101,8 +107,11 @@ export function StatusReportForm({ defaultValues, monitors, pages }: Props) {});}}- toast("saved");+ if (nextUrl) {+ router.push(nextUrl);+ }router.refresh();+ toast("saved");} catch {toast("error");}diff --git a/apps/web/src/components/forms/status-report-update-form.tsx b/apps/web/src/components/forms/status-report-update-form.tsxindex 65a714574..d5482fc21 100644--- a/apps/web/src/components/forms/status-report-update-form.tsx+++ b/apps/web/src/components/forms/status-report-update-form.tsx@@ -40,11 +40,13 @@ import { api } from "@/trpc/client";interface Props {defaultValues?: InsertStatusReportUpdate;statusReportId: number;+ nextUrl?: string;}export function StatusReportUpdateForm({defaultValues,statusReportId,+ nextUrl,}: Props) {const form = useForm<InsertStatusReportUpdate>({resolver: zodResolver(insertStatusReportUpdateSchema),@@ -69,9 +71,10 @@ export function StatusReportUpdateForm({await api.statusReport.createStatusReportUpdate.mutate({ ...props });}toast("saved");+ if (nextUrl) {+ router.push(nextUrl);+ }router.refresh();- // TODO: temporary solution, we might wanna use a server-action with redirect- router.push("../");} catch {toast("error");}diff --git a/apps/web/src/components/status-update/events.tsx b/apps/web/src/components/status-update/events.tsxindex 82ca99d4e..9be201e22 100644--- a/apps/web/src/components/status-update/events.tsx+++ b/apps/web/src/components/status-update/events.tsx@@ -68,9 +68,7 @@ export function Events({variant="outline"className="h-7 w-7 p-0"onClick={() => {- router.push(- `./${update.statusReportId}/update/edit?statusUpdate=${update.id}`,- );+ router.push(`./update/edit?statusUpdate=${update.id}`);}}><Icons.pencil className="h-4 w-4" />