Skip to content

Open-source status page, incident response and uptime monitoring

🐛 pagination monitor (#888)

Thibault Le Ouay60f79f796079
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
index 0bf4bc719..298643219 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx
@@ -11,6 +11,7 @@ import { columns } from "@/components/data-table/monitor/columns";
import { DataTable } from "@/components/data-table/monitor/data-table";
import { env } from "@/env";
import { api } from "@/trpc/server";
+import { DataTableWrapper } from "../[id]/data/_components/data-table-wrapper";
const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });
@@ -32,9 +33,11 @@ const searchParamsSchema = z.object({
if (v === "true") return true;
if (v === "false") return false;
return undefined;
- }),
+ })
)
.optional(),
+ pageSize: z.coerce.number().optional().default(10),
+ pageIndex: z.coerce.number().optional().default(0),
});
export default async function MonitorPage({
@@ -74,34 +77,34 @@ export default async function MonitorPage({
{
monitorId: String(monitor.id),
},
- { cache: "no-store", revalidate: 0 },
+ { cache: "no-store", revalidate: 0 }
);
const data = await tb.endpointStatusPeriod("7d")(
{
monitorId: String(monitor.id),
},
- { cache: "no-store", revalidate: 0 },
+ { cache: "no-store", revalidate: 0 }
);
const [current] = metrics?.sort((a, b) =>
- (a.lastTimestamp || 0) - (b.lastTimestamp || 0) < 0 ? 1 : -1,
+ (a.lastTimestamp || 0) - (b.lastTimestamp || 0) < 0 ? 1 : -1
) || [undefined];
const incidents = _incidents.filter(
- (incident) => incident.monitorId === monitor.id,
+ (incident) => incident.monitorId === monitor.id
);
const tags = monitor.monitorTagsToMonitors.map(
- ({ monitorTag }) => monitorTag,
+ ({ monitorTag }) => monitorTag
);
const maintenances = _maintenances.filter((maintenance) =>
- maintenance.monitors.includes(monitor.id),
+ maintenance.monitors.includes(monitor.id)
);
return { monitor, metrics: current, data, incidents, maintenances, tags };
- }),
+ })
);
return (
@@ -114,6 +117,10 @@ export default async function MonitorPage({
columns={columns}
data={monitorsWithData}
tags={tags}
+ defaultPagination={{
+ pageIndex: search.data.pageIndex,
+ pageSize: search.data.pageSize,
+ }}
/>
{isLimitReached ? <Limit /> : null}
</>
diff --git a/apps/web/src/components/data-table/monitor/data-table.tsx b/apps/web/src/components/data-table/monitor/data-table.tsx
index ab981e2e2..a37daae5d 100644
--- a/apps/web/src/components/data-table/monitor/data-table.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table.tsx
@@ -3,6 +3,7 @@
import type {
ColumnDef,
ColumnFiltersState,
+ PaginationState,
Table as TTable,
VisibilityState,
} from "@tanstack/react-table";
@@ -11,6 +12,7 @@ import {
getCoreRowModel,
getFacetedRowModel,
getFilteredRowModel,
+ getPaginationRowModel,
useReactTable,
} from "@tanstack/react-table";
import * as React from "react";
@@ -36,6 +38,7 @@ interface DataTableProps<TData, TValue> {
data: TData[];
tags?: MonitorTag[];
defaultColumnFilters?: ColumnFiltersState;
+ defaultPagination?: PaginationState;
}
export function DataTable<TData, TValue>({
@@ -43,6 +46,7 @@ export function DataTable<TData, TValue>({
data,
tags,
defaultColumnFilters = [],
+ defaultPagination = { pageIndex: 0, pageSize: 10 },
}: DataTableProps<TData, TValue>) {
const [columnFilters, setColumnFilters] =
React.useState<ColumnFiltersState>(defaultColumnFilters);
@@ -52,13 +56,19 @@ export function DataTable<TData, TValue>({
id: false, // we hide the id column
});
+ const [pagination, setPagination] =
+ React.useState<PaginationState>(defaultPagination);
+
const table = useReactTable({
data,
columns,
state: {
columnFilters,
columnVisibility,
+ pagination,
},
+ onPaginationChange: setPagination,
+ getPaginationRowModel: getPaginationRowModel(),
onColumnFiltersChange: setColumnFilters,
onColumnVisibilityChange: setColumnVisibility,
getFilteredRowModel: getFilteredRowModel(),
@@ -113,7 +123,7 @@ export function DataTable<TData, TValue>({
? null
: flexRender(
header.column.columnDef.header,
- header.getContext(),
+ header.getContext()
)}
</TableHead>
);
@@ -132,7 +142,7 @@ export function DataTable<TData, TValue>({
<TableCell key={cell.id}>
{flexRender(
cell.column.columnDef.cell,
- cell.getContext(),
+ cell.getContext()
)}
</TableCell>
))}