Skip to content

Open-source status page, incident response and uptime monitoring

fix: search params (#793)

Maximilian Kaske56e60ef02e82
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 8e4b02cd5..ae310d3e5 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
@@ -1,5 +1,7 @@
import * as React from "react";
import Link from "next/link";
+import { notFound } from "next/navigation";
+import { z } from "zod";
import { OSTinybird } from "@openstatus/tinybird";
import { Button } from "@openstatus/ui";
@@ -17,10 +19,27 @@ const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });
export const dynamic = "force-dynamic";
-export default async function MonitorPage() {
+/**
+ * allowed URL search params
+ */
+const searchParamsSchema = z.object({
+ tags: z
+ .string()
+ .transform((v) => v?.split(","))
+ .optional(),
+});
+
+export default async function MonitorPage({
+ searchParams,
+}: {
+ searchParams: { [key: string]: string | string[] | undefined };
+}) {
+ const search = searchParamsSchema.safeParse(searchParams);
const monitors = await api.monitor.getMonitorsByWorkspace.query();
const isLimitReached = await api.monitor.isMonitorLimitReached.query();
+ if (!search.success) return notFound();
+
if (monitors?.length === 0)
return (
<EmptyState
@@ -80,7 +99,14 @@ export default async function MonitorPage() {
return (
<>
- <DataTable columns={columns} data={monitorsWithData} tags={tags} />
+ <DataTable
+ defaultColumnFilters={[{ id: "tags", value: search.data.tags }].filter(
+ (v) => v.value !== undefined,
+ )}
+ columns={columns}
+ data={monitorsWithData}
+ tags={tags}
+ />
{isLimitReached ? <Limit /> : null}
{/* <RefreshWidget defaultValue={lastCronTimestamp} /> */}
</>
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 cefc2a4e9..7abf83f55 100644
--- a/apps/web/src/components/data-table/monitor/data-table.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table.tsx
@@ -33,16 +33,17 @@ interface DataTableProps<TData, TValue> {
columns: ColumnDef<TData, TValue>[];
data: TData[];
tags?: MonitorTag[];
+ defaultColumnFilters?: ColumnFiltersState;
}
export function DataTable<TData, TValue>({
columns,
data,
tags,
+ defaultColumnFilters = [],
}: DataTableProps<TData, TValue>) {
- const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
- [],
- );
+ const [columnFilters, setColumnFilters] =
+ React.useState<ColumnFiltersState>(defaultColumnFilters);
const [columnVisibility, setColumnVisibility] =
React.useState<VisibilityState>({
public: false, // default is true