Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: nuqs (#1001)
Maximilian Kaskee4dc94e9ff0d
diff --git a/apps/web/package.json b/apps/web/package.jsonindex f46f195d3..ef5c51fb3 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -66,6 +66,7 @@"next-contentlayer": "0.3.4","next-plausible": "3.12.0","next-themes": "0.2.1",+ "nuqs": "1.19.1","posthog-js": "1.136.1","posthog-node": "4.0.1","random-word-slugs": "0.1.7",diff --git a/apps/web/src/app/(content)/blog/page.tsx b/apps/web/src/app/(content)/blog/page.tsxindex e260de2cc..b23d733b6 100644--- a/apps/web/src/app/(content)/blog/page.tsx+++ b/apps/web/src/app/(content)/blog/page.tsx@@ -15,7 +15,11 @@ import { allPosts } from "contentlayer/generated";import { Rss } from "lucide-react";import type { Metadata } from "next";import Link from "next/link";-import { z } from "zod";+import {+ ITEMS_PER_PAGE,+ MAX_PAGE_INDEX,+ searchParamsCache,+} from "./search-params";export const metadata: Metadata = {...defaultMetadata,@@ -30,32 +34,19 @@ export const metadata: Metadata = {},};-const searchParamsSchema = z.object({- page: z- .string()- .optional()- .transform((val) => Number.parseInt(val || "1", 10)),-});--const ITEMS_PER_PAGE = 10;-export default function Post({searchParams,}: {searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);-- const page = search.data?.page;- const current = !page ? 1 : page;- const total = Math.ceil(allPosts.length / ITEMS_PER_PAGE);+ const { pageIndex } = searchParamsCache.parse(searchParams);const posts = allPosts.sort((a, b) =>new Date(b.publishedAt).getTime() - new Date(a.publishedAt).getTime(),)- .slice((current - 1) * ITEMS_PER_PAGE, current * ITEMS_PER_PAGE);+ .slice(pageIndex * ITEMS_PER_PAGE, (pageIndex + 1) * ITEMS_PER_PAGE);return (<Shell>@@ -89,29 +80,27 @@ export default function Post({</div></Timeline.Article>))}- {current && total && (- <div className="grid grid-cols-1 gap-4 md:grid-cols-5 md:gap-6">- <div className="row-span-2" />- <div className="w-full md:order-2 md:col-span-4">- <Pagination>- <PaginationContent>- {Array.from({ length: total }).map((_, index) => {- return (- <PaginationLink- // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>- key={index}- href={`?page=${index + 1}`}- isActive={current === index + 1}- >- {index + 1}- </PaginationLink>- );- })}- </PaginationContent>- </Pagination>- </div>+ <div className="grid grid-cols-1 gap-4 md:grid-cols-5 md:gap-6">+ <div className="row-span-2" />+ <div className="w-full md:order-2 md:col-span-4">+ <Pagination>+ <PaginationContent>+ {Array.from({ length: MAX_PAGE_INDEX + 1 }).map((_, index) => {+ return (+ <PaginationLink+ // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>+ key={index}+ href={`?pageIndex=${index}`}+ isActive={pageIndex === index}+ >+ {index + 1}+ </PaginationLink>+ );+ })}+ </PaginationContent>+ </Pagination></div>- )}+ </div></Timeline></Shell>);diff --git a/apps/web/src/app/(content)/blog/search-params.ts b/apps/web/src/app/(content)/blog/search-params.tsnew file mode 100644index 000000000..41fce7aa9--- /dev/null+++ b/apps/web/src/app/(content)/blog/search-params.ts@@ -0,0 +1,26 @@+import { allPosts } from "contentlayer/generated";+import {+ createParser,+ createSearchParamsCache,+ parseAsInteger,+} from "nuqs/server";++const parseAsPageIndex = createParser({+ parse(queryValue) {+ const parsed = parseAsInteger.parse(queryValue);+ if (!parsed || parsed < 0) return 0;+ return Math.min(parsed, MAX_PAGE_INDEX);+ },+ serialize(value) {+ return value.toString();+ },+});++export const ITEMS_PER_PAGE = 10;+export const MAX_PAGE_INDEX = Math.ceil(allPosts.length / ITEMS_PER_PAGE) - 1;++export const searchParamsParsers = {+ pageIndex: parseAsPageIndex.withDefault(0),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/(content)/changelog/page.tsx b/apps/web/src/app/(content)/changelog/page.tsxindex b93a20af3..881a7c0d1 100644--- a/apps/web/src/app/(content)/changelog/page.tsx+++ b/apps/web/src/app/(content)/changelog/page.tsx@@ -15,7 +15,11 @@ import {import { allChangelogs } from "contentlayer/generated";import { Rss } from "lucide-react";import type { Metadata } from "next";-import { z } from "zod";+import {+ ITEMS_PER_PAGE,+ MAX_PAGE_INDEX,+ searchParamsCache,+} from "./search-params";export const metadata: Metadata = {...defaultMetadata,@@ -30,32 +34,19 @@ export const metadata: Metadata = {},};-const searchParamsSchema = z.object({- page: z- .string()- .optional()- .transform((val) => Number.parseInt(val || "1", 10)),-});--const ITEMS_PER_PAGE = 10;-export default function ChangelogClient({searchParams,}: {searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);-- const page = search.data?.page;- const current = !page ? 1 : page;- const total = Math.ceil(allChangelogs.length / ITEMS_PER_PAGE);+ const { pageIndex } = searchParamsCache.parse(searchParams);const changelogs = allChangelogs.sort((a, b) =>new Date(b.publishedAt).getTime() - new Date(a.publishedAt).getTime(),)- .slice((current - 1) * ITEMS_PER_PAGE, current * ITEMS_PER_PAGE);+ .slice(pageIndex * ITEMS_PER_PAGE, (pageIndex + 1) * ITEMS_PER_PAGE);return (<Shell>@@ -82,29 +73,27 @@ export default function ChangelogClient({<Mdx code={changelog.body.code} /></Timeline.Article>))}- {current && total && (- <div className="grid grid-cols-1 gap-4 md:grid-cols-5 md:gap-6">- <div className="row-span-2" />- <div className="w-full md:order-2 md:col-span-4">- <Pagination>- <PaginationContent>- {Array.from({ length: total }).map((_, index) => {- return (- <PaginationLink- // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>- key={index}- href={`?page=${index + 1}`}- isActive={current === index + 1}- >- {index + 1}- </PaginationLink>- );- })}- </PaginationContent>- </Pagination>- </div>+ <div className="grid grid-cols-1 gap-4 md:grid-cols-5 md:gap-6">+ <div className="row-span-2" />+ <div className="w-full md:order-2 md:col-span-4">+ <Pagination>+ <PaginationContent>+ {Array.from({ length: MAX_PAGE_INDEX + 1 }).map((_, index) => {+ return (+ <PaginationLink+ // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>+ key={index}+ href={`?pageIndex=${index}`}+ isActive={pageIndex === index}+ >+ {index + 1}+ </PaginationLink>+ );+ })}+ </PaginationContent>+ </Pagination></div>- )}+ </div></Timeline></Shell>);diff --git a/apps/web/src/app/(content)/changelog/search-params.ts b/apps/web/src/app/(content)/changelog/search-params.tsnew file mode 100644index 000000000..13821434b--- /dev/null+++ b/apps/web/src/app/(content)/changelog/search-params.ts@@ -0,0 +1,27 @@+import { allChangelogs } from "contentlayer/generated";+import {+ createParser,+ createSearchParamsCache,+ parseAsInteger,+} from "nuqs/server";++const parseAsPageIndex = createParser({+ parse(queryValue) {+ const parsed = parseAsInteger.parse(queryValue);+ if (!parsed || parsed < 0) return 0;+ return Math.min(parsed, MAX_PAGE_INDEX);+ },+ serialize(value) {+ return value.toString();+ },+});++export const ITEMS_PER_PAGE = 10;+export const MAX_PAGE_INDEX =+ Math.ceil(allChangelogs.length / ITEMS_PER_PAGE) - 1;++export const searchParamsParsers = {+ pageIndex: parseAsPageIndex.withDefault(0),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/(auth)/login/page.tsx b/apps/web/src/app/app/(auth)/login/page.tsxindex 8e335d081..6cf3b7a17 100644--- a/apps/web/src/app/app/(auth)/login/page.tsx+++ b/apps/web/src/app/app/(auth)/login/page.tsx@@ -1,5 +1,4 @@import Link from "next/link";-import { z } from "zod";import { Button, Separator } from "@openstatus/ui";@@ -8,23 +7,16 @@ import DevModeContainer from "@/components/dev-mode-container";import { Icons } from "@/components/icons";import { signIn } from "@/lib/auth";import MagicLinkForm from "./_components/magic-link-form";+import { searchParamsCache } from "./search-params";const isDev = process.env.NODE_ENV === "development";-/**- * allowed URL search params- */-const searchParamsSchema = z.object({- redirectTo: z.string().optional().default("/app"),-});-export default function Page({searchParams,}: {searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);- const redirectTo = search.success ? search.data.redirectTo : "/app";+ const { redirectTo } = searchParamsCache.parse(searchParams);return (<Shell className="my-4 grid w-full max-w-xl gap-6 md:p-10">diff --git a/apps/web/src/app/app/(auth)/login/search-params.ts b/apps/web/src/app/app/(auth)/login/search-params.tsnew file mode 100644index 000000000..de6e7fbf3--- /dev/null+++ b/apps/web/src/app/app/(auth)/login/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ redirectTo: parseAsString.withDefault("/app"),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);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.tsxindex 3dcc5f8d4..08faf1432 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,6 +1,4 @@import Link from "next/link";-import { notFound } from "next/navigation";-import { z } from "zod";import { OSTinybird } from "@openstatus/tinybird";import { Button } from "@openstatus/ui/src/components/button";@@ -11,38 +9,16 @@ 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 { searchParamsCache } from "./search-params";const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });-/**- * allowed URL search params- */-const searchParamsSchema = z.object({- tags: z- .string()- .transform((v) => v?.split(","))- .optional(),- public: z- .string()- .transform((v) =>- v?.split(",").map((v) => {- 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({searchParams,}: {searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);- if (!search.success) return notFound();+ const search = searchParamsCache.parse(searchParams);const monitors = await api.monitor.getMonitorsByWorkspace.query();if (monitors?.length === 0)@@ -117,15 +93,15 @@ export default async function MonitorPage({<><DataTabledefaultColumnFilters={[- { id: "tags", value: search.data.tags },- { id: "public", value: search.data.public },- ].filter((v) => v.value !== undefined)}+ { id: "tags", value: search.tags },+ { id: "public", value: search.public },+ ].filter((v) => v.value !== undefined || v.value !== null)}columns={columns}data={monitorsWithData}tags={tags}defaultPagination={{- pageIndex: search.data.pageIndex,- pageSize: search.data.pageSize,+ pageIndex: search.pageIndex,+ pageSize: search.pageSize,}}/>{isLimitReached ? <Limit /> : null}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/search-params.tsnew file mode 100644index 000000000..1ed268783--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/search-params.ts@@ -0,0 +1,16 @@+import {+ createSearchParamsCache,+ parseAsArrayOf,+ parseAsBoolean,+ parseAsInteger,+ parseAsString,+} from "nuqs/server";++export const searchParamsParsers = {+ tags: parseAsArrayOf(parseAsString),+ public: parseAsArrayOf(parseAsBoolean),+ pageSize: parseAsInteger.withDefault(10),+ pageIndex: parseAsInteger.withDefault(0),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsxindex faa83ea1e..ef6524d10 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/page.tsx@@ -1,46 +1,16 @@import { notFound } from "next/navigation";import * as React from "react";-import * as z from "zod";import { OSTinybird } from "@openstatus/tinybird";import { DatePickerPreset } from "@/components/monitor-dashboard/date-picker-preset";import { env } from "@/env";-import { periods } from "@/lib/monitor/utils";import { api } from "@/trpc/server";import { DataTableWrapper } from "./_components/data-table-wrapper";-import { DownloadCSVButton } from "./_components/download-csv-button";+import { searchParamsCache } from "./search-params";const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });-/**- * allowed URL search params- */-const searchParamsSchema = z.object({- period: z.enum(periods).optional().default("1h"),- // improve coersion + array + ...- region: z- .string()- .optional()- .transform((val) => {- return val?.split(",");- }),- statusCode: z- .string()- .optional()- .transform((val) => {- return val?.split(",").map(Number.parseInt);- }),- error: z- .string()- .optional()- .transform((val) => {- return val?.split(",").map((v) => v === "true");- }),- pageSize: z.coerce.number().optional().default(10),- pageIndex: z.coerce.number().optional().default(0),-});-export default async function Page({params,searchParams,@@ -49,18 +19,16 @@ export default async function Page({searchParams: { [key: string]: string | string[] | undefined };}) {const id = params.id;- const search = searchParamsSchema.safeParse(searchParams);+ const search = searchParamsCache.parse(searchParams);const monitor = await api.monitor.getMonitorById.query({id: Number(id),});- if (!monitor || !search.success) {- return notFound(); // maybe not if search.success is false, add a toast message- }+ if (!monitor) return notFound();const allowedPeriods = ["1h", "1d", "3d", "7d"] as const;- const period = allowedPeriods.find((i) => i === search.data.period) || "1d";+ const period = allowedPeriods.find((i) => i === search.period) || "1d";const data = await tb.endpointList(period)({ monitorId: id });@@ -77,16 +45,17 @@ export default async function Page({}`}/> */}</div>+ {/* FIXME: we display all the regions even though a user might not have all supported in their plan */}<DataTableWrapperdata={data}filters={[- { id: "statusCode", value: search.data.statusCode },- { id: "region", value: search.data.region },- { id: "error", value: search.data.error },- ].filter((v) => v.value !== undefined)}+ { id: "statusCode", value: search.statusCode },+ { id: "region", value: search.regions },+ { id: "error", value: search.error },+ ].filter((v) => v.value !== null)}pagination={{- pageIndex: search.data.pageIndex,- pageSize: search.data.pageSize,+ pageIndex: search.pageIndex,+ pageSize: search.pageSize,}}/></div>diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.tsnew file mode 100644index 000000000..4fc8f9418--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts@@ -0,0 +1,22 @@+import { periods } from "@/lib/monitor/utils";+import { flyRegions } from "@openstatus/db/src/schema/constants";+import {+ createSearchParamsCache,+ parseAsArrayOf,+ parseAsBoolean,+ parseAsInteger,+ parseAsStringLiteral,+} from "nuqs/server";++export const DEFAULT_PERIOD = "1d";++export const searchParamsParsers = {+ statusCode: parseAsArrayOf(parseAsInteger),+ cronTimestamp: parseAsInteger,+ error: parseAsArrayOf(parseAsBoolean),+ period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),+ regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)),+ pageSize: parseAsInteger.withDefault(10),+ pageIndex: parseAsInteger.withDefault(0),+};+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsxindex f6b904554..c39ef9c89 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/page.tsx@@ -1,23 +1,11 @@import Link from "next/link";-import * as z from "zod";import { Button } from "@openstatus/ui/src/components/button";import { EmptyState } from "@/components/dashboard/empty-state";import { ResponseDetails } from "@/components/monitor-dashboard/response-details";import { api } from "@/trpc/server";-import { monitorFlyRegionSchema } from "@openstatus/db/src/schema/constants";-//--/**- * allowed URL search params- */-const searchParamsSchema = z.object({- monitorId: z.string(),- url: z.string(),- region: monitorFlyRegionSchema.optional(),- cronTimestamp: z.coerce.number(),-});+import { searchParamsCache } from "./search-params";export default async function Details({// biome-ignore lint/correctness/noUnusedVariables: <explanation>@@ -27,15 +15,15 @@ export default async function Details({params: { id: string; workspaceSlug: string };searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);+ const search = searchParamsCache.parse(searchParams);- if (!search.success) return <PageEmptyState />;+ if (!search.monitorId) return <PageEmptyState />;try {await api.monitor.getMonitorById.query({- id: Number.parseInt(search.data.monitorId),+ id: Number.parseInt(search.monitorId),});- return <ResponseDetails {...search.data} />;+ return <ResponseDetails {...search} />;} catch (_e) {return <PageEmptyState />;}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/search-params.tsnew file mode 100644index 000000000..1b3d1d07c--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/search-params.ts@@ -0,0 +1,15 @@+import { flyRegions } from "@openstatus/db/src/schema/constants";+import {+ createSearchParamsCache,+ parseAsInteger,+ parseAsString,+ parseAsStringLiteral,+} from "nuqs/server";++export const searchParamsParsers = {+ monitorId: parseAsString.withDefault(""),+ url: parseAsString.withDefault(""),+ region: parseAsStringLiteral(flyRegions).withDefault("ams"),+ cronTimestamp: parseAsInteger.withDefault(0),+};+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsxindex 77a10636e..d50899ce5 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/page.tsx@@ -1,11 +1,6 @@-import { z } from "zod";-import { MonitorForm } from "@/components/forms/monitor/form";import { api } from "@/trpc/server";--const searchParamsSchema = z.object({- section: z.string().optional().default("request"),-});+import { searchParamsCache } from "./search-params";export default async function EditPage({params,@@ -28,11 +23,11 @@ export default async function EditPage({const tags = await api.monitorTag.getMonitorTagsByWorkspace.query();- // default is request- const search = searchParamsSchema.safeParse(searchParams);+ const { section } = searchParamsCache.parse(searchParams);+return (<MonitorForm- defaultSection={search.success ? search.data.section : undefined}+ defaultSection={section}defaultValues={{...monitor,// FIXME - Why is this not working?diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/search-params.tsnew file mode 100644index 000000000..a1ce750f8--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/edit/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ section: parseAsString.withDefault("request"),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsxindex 15831eb28..ef2375e97 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx@@ -1,6 +1,5 @@import { notFound } from "next/navigation";import * as React from "react";-import * as z from "zod";import { flyRegions } from "@openstatus/db/src/schema/constants";import type { Region } from "@openstatus/tinybird";@@ -12,42 +11,18 @@ import { ButtonReset } from "@/components/monitor-dashboard/button-reset";import { DatePickerPreset } from "@/components/monitor-dashboard/date-picker-preset";import { Metrics } from "@/components/monitor-dashboard/metrics";import { env } from "@/env";-import {- getMinutesByInterval,- intervals,- periods,- quantiles,-} from "@/lib/monitor/utils";+import { getMinutesByInterval, periods } from "@/lib/monitor/utils";import { getPreferredSettings } from "@/lib/preferred-settings/server";import { api } from "@/trpc/server";+import {+ DEFAULT_INTERVAL,+ DEFAULT_PERIOD,+ DEFAULT_QUANTILE,+ searchParamsCache,+} from "./search-params";const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });-const DEFAULT_QUANTILE = "p95";-const DEFAULT_INTERVAL = "30m";-const DEFAULT_PERIOD = "1d";--/**- * allowed URL search params- */-const searchParamsSchema = z.object({- statusCode: z.coerce.number().optional(),- cronTimestamp: z.coerce.number().optional(),- quantile: z.enum(quantiles).optional().default(DEFAULT_QUANTILE),- interval: z.enum(intervals).optional().default(DEFAULT_INTERVAL),- period: z.enum(periods).optional().default(DEFAULT_PERIOD),- regions: z- .string()- .optional()- .transform(- (value) =>- value- ?.trim()- ?.split(",")- .filter((i) => flyRegions.includes(i as Region)) ?? [],- ),-});-export default async function Page({params,searchParams,@@ -56,22 +31,17 @@ export default async function Page({searchParams: { [key: string]: string | string[] | undefined };}) {const id = params.id;- const search = searchParamsSchema.safeParse(searchParams);+ const search = searchParamsCache.parse(searchParams);- if (!search.success) {- return notFound();- }const preferredSettings = getPreferredSettings();const monitor = await api.monitor.getMonitorById.query({id: Number(id),});- if (!monitor) {- return notFound();- }+ if (!monitor) return notFound();- const { period, quantile, interval, regions } = search.data;+ const { period, quantile, interval, regions } = search;// TODO: work it out easierconst intervalMinutes = getMinutesByInterval(interval);@@ -97,7 +67,7 @@ export default async function Page({period !== DEFAULT_PERIOD ||quantile !== DEFAULT_QUANTILE ||interval !== DEFAULT_INTERVAL ||- regions.length > 0;+ flyRegions.length !== regions.length;// GET VALUES FOR BLOG POST// console.log(diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/search-params.tsnew file mode 100644index 000000000..1ad6aefa5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/search-params.ts@@ -0,0 +1,24 @@+import { intervals, periods, quantiles } from "@/lib/monitor/utils";+import { flyRegions } from "@openstatus/db/src/schema/constants";+import {+ createSearchParamsCache,+ parseAsArrayOf,+ parseAsInteger,+ parseAsStringLiteral,+} from "nuqs/server";++export const DEFAULT_QUANTILE = "p95";+export const DEFAULT_INTERVAL = "30m";+export const DEFAULT_PERIOD = "1d";++export const searchParamsParsers = {+ statusCode: parseAsInteger,+ cronTimestamp: parseAsInteger,+ quantile: parseAsStringLiteral(quantiles).withDefault(DEFAULT_QUANTILE),+ interval: parseAsStringLiteral(intervals).withDefault(DEFAULT_INTERVAL),+ period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),+ regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault([+ ...flyRegions,+ ]),+};+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsxindex 1ca457f0b..cbf9fae5e 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/page.tsx@@ -1,12 +1,8 @@import { redirect } from "next/navigation";-import { z } from "zod";import { MonitorForm } from "@/components/forms/monitor/form";import { api } from "@/trpc/server";--const searchParamsSchema = z.object({- section: z.string().optional().default("request"),-});+import { searchParamsCache } from "./search-params";export default async function Page({searchParams,@@ -23,11 +19,11 @@ export default async function Page({if (isLimitReached) return redirect("./");- const search = searchParamsSchema.safeParse(searchParams);+ const { section } = searchParamsCache.parse(searchParams);return (<MonitorForm- defaultSection={search.success ? search.data.section : undefined}+ defaultSection={section}notifications={notifications}pages={pages}tags={tags}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/search-params.tsnew file mode 100644index 000000000..a1ce750f8--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ section: parseAsString.withDefault("request"),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/pagerduty/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/pagerduty/page.tsxindex bfd761656..8b0dace82 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/pagerduty/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/pagerduty/page.tsx@@ -4,14 +4,10 @@ import { api } from "@/trpc/server";import { getLimit } from "@openstatus/db/src/schema/plan/utils";import { PagerDutySchema } from "@openstatus/notification-pagerduty";-import { z } from "zod";+import { searchParamsCache } from "./search-params";// REMINDER: PagerDuty requires a different workflow, thus the separate page-const searchParamsSchema = z.object({- config: z.string().optional(),-});-export default async function PagerDutyPage({searchParams,}: {@@ -19,7 +15,7 @@ export default async function PagerDutyPage({}) {const workspace = await api.workspace.getWorkspace.query();const monitors = await api.monitor.getMonitorsByWorkspace.query();- const params = searchParamsSchema.parse(searchParams);+ const params = searchParamsCache.parse(searchParams);if (!params.config) {return <div>Invalid data</div>;diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/pagerduty/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/pagerduty/search-params.tsnew file mode 100644index 000000000..8b0506164--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/pagerduty/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ config: parseAsString,+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/page.tsxindex 3d5acaf34..15442f7c7 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/page.tsx@@ -1,31 +1,27 @@import * as React from "react";import { api } from "@/trpc/server";-import { z } from "zod";import { PathCard } from "./_components/path-card";import { SessionTable } from "./_components/session-table";--const searchParamsSchema = z.object({- path: z.string(),-});+import { searchParamsCache } from "./search-params";export default async function RUMPage({searchParams,}: {searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);+ const { path } = searchParamsCache.parse(searchParams);const applications = await api.workspace.getApplicationWorkspaces.query();const dsn = applications?.[0]?.dsn;- if (!search.success || !dsn) return null;+ if (!path || !dsn) return null;return (<>- <PathCard dsn={dsn} path={search.data.path} />+ <PathCard dsn={dsn} path={path} /><div>- <SessionTable dsn={dsn} path={search.data.path} />+ <SessionTable dsn={dsn} path={path} /></div></>);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/search-params.tsnew file mode 100644index 000000000..d24e97c60--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/overview/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ path: parseAsString,+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/edit/page.tsxindex f5b4c9572..5a4bd3589 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/edit/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/edit/page.tsx@@ -1,12 +1,8 @@import { notFound } from "next/navigation";-import { z } from "zod";import { StatusPageForm } from "@/components/forms/status-page/form";import { api } from "@/trpc/server";--const searchParamsSchema = z.object({- section: z.string().optional().default("monitors"),-});+import { searchParamsCache } from "./search-params";export default async function EditPage({params,@@ -24,8 +20,7 @@ export default async function EditPage({return notFound();}- // default is request- const search = searchParamsSchema.safeParse(searchParams);+ const { section } = searchParamsCache.parse(searchParams);return (<StatusPageForm@@ -37,7 +32,7 @@ export default async function EditPage({order,})),}}- defaultSection={search.success ? search.data.section : undefined}+ defaultSection={section}plan={workspace.plan}workspaceSlug={params.workspaceSlug}/>diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/edit/search-params.ts b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/edit/search-params.tsnew file mode 100644index 000000000..2481fe05b--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/edit/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ section: parseAsString.withDefault("monitors"),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/app/invite/page.tsx b/apps/web/src/app/app/invite/page.tsxindex 144333b53..cf83201a4 100644--- a/apps/web/src/app/app/invite/page.tsx+++ b/apps/web/src/app/app/invite/page.tsx@@ -1,28 +1,20 @@-import { z } from "zod";-import { Alert, AlertDescription, AlertTitle, Separator } from "@openstatus/ui";import { Icons } from "@/components/icons";import { api } from "@/trpc/server";import { LinkCards } from "./_components/link-cards";+import { searchParamsCache } from "./search-params";const AlertTriangle = Icons["alert-triangle"];-/**- * allowed URL search params- */-const searchParamsSchema = z.object({- token: z.string(),-});-export default async function InvitePage({searchParams,}: {searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);- const { message, data } = search.success- ? await api.invitation.acceptInvitation.mutate({ token: search.data.token })+ const { token } = searchParamsCache.parse(searchParams);+ const { message, data } = token+ ? await api.invitation.acceptInvitation.mutate({ token }): { message: "Unavailable invitation token.", data: undefined };const workspace = await api.workspace.getWorkspace.query();diff --git a/apps/web/src/app/app/invite/search-params.ts b/apps/web/src/app/app/invite/search-params.tsnew file mode 100644index 000000000..9f29abbef--- /dev/null+++ b/apps/web/src/app/app/invite/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ token: parseAsString,+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/play/checker/[id]/page.tsx b/apps/web/src/app/play/checker/[id]/page.tsxindex b4bef3820..518277030 100644--- a/apps/web/src/app/play/checker/[id]/page.tsx+++ b/apps/web/src/app/play/checker/[id]/page.tsx@@ -1,12 +1,8 @@import type { Metadata } from "next";import Link from "next/link";import { redirect } from "next/navigation";-import * as z from "zod";-import {- flyRegions,- monitorFlyRegionSchema,-} from "@openstatus/db/src/schema/constants";+import { flyRegions } from "@openstatus/db/src/schema/constants";import { Separator } from "@openstatus/ui";import {@@ -21,24 +17,7 @@ import {getCheckerDataById,timestampFormatter,} from "@/components/ping-response-analysis/utils";-import type { Region } from "@openstatus/tinybird";--/**- * allowed URL search params- */-const searchParamsSchema = z.object({- regions: z- .string()- .optional()- .transform(- (value) =>- value- ?.trim()- ?.split(",")- .filter((i) => flyRegions.includes(i as Region)) ?? flyRegions,- )- .pipe(monitorFlyRegionSchema.array().optional()),-});+import { searchParamsCache } from "./search-params";interface Props {params: { id: string };@@ -46,9 +25,8 @@ interface Props {}export default async function CheckPage({ params, searchParams }: Props) {- const search = searchParamsSchema.safeParse(searchParams);-- const selectedRegions = search.success ? search.data.regions : undefined;+ const { regions } = searchParamsCache.parse(searchParams);+ const selectedRegions = regions || [...flyRegions];const data = await getCheckerDataById(params.id);diff --git a/apps/web/src/app/play/checker/[id]/search-params.ts b/apps/web/src/app/play/checker/[id]/search-params.tsnew file mode 100644index 000000000..c16f7acef--- /dev/null+++ b/apps/web/src/app/play/checker/[id]/search-params.ts@@ -0,0 +1,13 @@+import { flyRegions } from "@openstatus/db/src/schema/constants";+import {+ createSearchParamsCache,+ parseAsArrayOf,+ parseAsString,+ parseAsStringLiteral,+} from "nuqs/server";++export const searchParamsParsers = {+ regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)),+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/play/checker/_components/checker-form.tsx b/apps/web/src/app/play/checker/_components/checker-form.tsxindex 443a09307..754aa47d4 100644--- a/apps/web/src/app/play/checker/_components/checker-form.tsx+++ b/apps/web/src/app/play/checker/_components/checker-form.tsx@@ -1,8 +1,8 @@"use client";import { zodResolver } from "@hookform/resolvers/zod";-import { usePathname, useRouter, useSearchParams } from "next/navigation";-import { useMemo, useState, useTransition } from "react";+import { useRouter } from "next/navigation";+import { useState, useTransition } from "react";import { useForm } from "react-hook-form";import * as z from "zod";@@ -47,7 +47,6 @@ import {regionCheckerSchema,regionFormatter,} from "@/components/ping-response-analysis/utils";-import useUpdateSearchParams from "@/hooks/use-update-search-params";import { toast } from "@/lib/toast";import { notEmpty } from "@/lib/utils";import { flyRegions } from "@openstatus/db/src/schema/constants";@@ -60,6 +59,8 @@ import {} from "lucide-react";import dynamic from "next/dynamic";import Link from "next/link";+import { useQueryStates } from "nuqs";+import { searchParamsParsers } from "../search-params";const FloatingActionNoSSR = dynamic(() =>@@ -91,7 +92,6 @@ interface CheckerFormProps {}export function CheckerForm({ defaultValues, defaultData }: CheckerFormProps) {- const pathname = usePathname();const router = useRouter();const [isPending, startTransition] = useTransition();const form = useForm<FormSchema>({@@ -99,12 +99,7 @@ export function CheckerForm({ defaultValues, defaultData }: CheckerFormProps) {defaultValues,});const [result, setResult] = useState<RegionChecker[]>(defaultData || []);- const updateSearchParams = useUpdateSearchParams();- const searchParams = useSearchParams();-- const id = useMemo(() => {- return searchParams.get("id");- }, [searchParams]);+ const [{ id }, setSearchParams] = useQueryStates(searchParamsParsers);function onSubmit(data: FormSchema) {startTransition(async () => {@@ -153,10 +148,7 @@ export function CheckerForm({ defaultValues, defaultData }: CheckerFormProps) {duration: 2000,});} else {- const searchParams = updateSearchParams({- id: item,- });- router.replace(`${pathname}?${searchParams}`);+ setSearchParams({ id: item });toast.success("Data is available!", {id: toastId,duration: 3000,@@ -199,8 +191,7 @@ export function CheckerForm({ defaultValues, defaultData }: CheckerFormProps) {}}} catch (_e) {- const searchParams = updateSearchParams({ id: null });- router.replace(`${pathname}?${searchParams}`);+ setSearchParams({ id: null });toast.error("Something went wrong", {description: "Please try again",id: toastId,diff --git a/apps/web/src/app/play/checker/page.tsx b/apps/web/src/app/play/checker/page.tsxindex ad36688d5..405a94d3e 100644--- a/apps/web/src/app/play/checker/page.tsx+++ b/apps/web/src/app/play/checker/page.tsx@@ -3,10 +3,10 @@ import type { Metadata } from "next";import { BottomCTA } from "@/components/marketing/in-between-cta";import { getCheckerDataById } from "@/components/ping-response-analysis/utils";import { redirect } from "next/navigation";-import { z } from "zod";import CheckerPlay from "./_components/checker-play";import { GlobalMonitoring } from "./_components/global-monitoring";import { Testimonial } from "./_components/testimonial";+import { searchParamsCache } from "./search-params";export const metadata: Metadata = {title: "Global Speed Checker",@@ -19,18 +19,12 @@ export const metadata: Metadata = {},};-const searchParamsSchema = z.object({- id: z.string().optional(),-});-export default async function PlayPage({searchParams,}: {searchParams: { [key: string]: string | string[] | undefined };}) {- const search = searchParamsSchema.safeParse(searchParams);-- const id = search.success ? search.data.id : undefined;+ const { id } = searchParamsCache.parse(searchParams);const data = id ? await getCheckerDataById(id) : null;diff --git a/apps/web/src/app/play/checker/search-params.ts b/apps/web/src/app/play/checker/search-params.tsnew file mode 100644index 000000000..fc70c0e3c--- /dev/null+++ b/apps/web/src/app/play/checker/search-params.ts@@ -0,0 +1,7 @@+import { createSearchParamsCache, parseAsString } from "nuqs/server";++export const searchParamsParsers = {+ id: parseAsString,+};++export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/play/status/_components/timezone-combobox.tsx b/apps/web/src/app/play/status/_components/timezone-combobox.tsxdeleted file mode 100644index c173b1db0..000000000--- a/apps/web/src/app/play/status/_components/timezone-combobox.tsx+++ /dev/null@@ -1,104 +0,0 @@-"use client";--import { Check, ChevronsUpDown } from "lucide-react";-import { usePathname, useRouter } from "next/navigation";-import * as React from "react";--import {- Button,- Command,- CommandEmpty,- CommandGroup,- CommandInput,- CommandItem,- CommandList,- Popover,- PopoverContent,- PopoverTrigger,-} from "@openstatus/ui";--import useUpdateSearchParams from "@/hooks/use-update-search-params";-import { cn } from "@/lib/utils";--const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;-const supportedTimezones = Intl.supportedValuesOf("timeZone");--export function TimezoneCombobox({ defaultValue }: { defaultValue?: string }) {- const [open, setOpen] = React.useState(false);- const pathname = usePathname();- const router = useRouter();- const updateSearchParams = useUpdateSearchParams();-- const value = defaultValue?.toLowerCase();-- const timezones = supportedTimezones.map((timezone) => ({- value: timezone.toLowerCase(),- label: timezone,- }));-- return (- <Popover open={open} onOpenChange={setOpen}>- <PopoverTrigger asChild>- <Button- variant="outline"- role="combobox"- aria-expanded={open}- className="w-[220px] justify-between"- >- <span className="truncate">- {value- ? timezones.find((timezone) => timezone.value === value)?.label- : "Select timezone..."}- {defaultValue?.toLowerCase() === currentTimezone?.toLowerCase() ? (- <span className="ml-1 font-light text-muted-foreground text-xs">- (default)- </span>- ) : null}- </span>- <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />- </Button>- </PopoverTrigger>- <PopoverContent className="w-[300px] p-0">- <Command>- <CommandInput placeholder="Search timezone..." />- <CommandList>- <CommandEmpty>No timezone found.</CommandEmpty>- <CommandGroup className="max-h-[300px] overflow-y-auto">- {timezones.map((timezone) => (- <CommandItem- key={timezone.value}- value={timezone.value}- onSelect={(currentValue) => {- setOpen(false);-- // update search params- const searchParams = updateSearchParams({- timezone:- currentValue === value- ? null // remove search param and use default timezone- : timezones.find(- (timezone) => timezone.value === currentValue,- )?.label || null,- });-- // refresh page with new search params- router.replace(`${pathname}?${searchParams}`);- router.refresh();- }}- >- <Check- className={cn(- "mr-2 h-4 w-4",- value === timezone.value ? "opacity-100" : "opacity-0",- )}- />- {timezone.label}- </CommandItem>- ))}- </CommandGroup>- </CommandList>- </Command>- </PopoverContent>- </Popover>- );-}diff --git a/apps/web/src/app/public/monitors/[id]/page.tsx b/apps/web/src/app/public/monitors/[id]/page.tsxindex 8edc46392..84ae2b9c0 100644--- a/apps/web/src/app/public/monitors/[id]/page.tsx+++ b/apps/web/src/app/public/monitors/[id]/page.tsx@@ -1,6 +1,5 @@import { notFound } from "next/navigation";import * as React from "react";-import * as z from "zod";import { flyRegions } from "@openstatus/db/src/schema/constants";import type { Region } from "@openstatus/tinybird";@@ -13,43 +12,19 @@ import { ButtonReset } from "@/components/monitor-dashboard/button-reset";import { DatePickerPreset } from "@/components/monitor-dashboard/date-picker-preset";import { Metrics } from "@/components/monitor-dashboard/metrics";import { env } from "@/env";-import {- getMinutesByInterval,- intervals,- quantiles,-} from "@/lib/monitor/utils";+import { getMinutesByInterval } from "@/lib/monitor/utils";import { getPreferredSettings } from "@/lib/preferred-settings/server";import { api } from "@/trpc/server";+import {+ DEFAULT_INTERVAL,+ DEFAULT_PERIOD,+ DEFAULT_QUANTILE,+ periods,+ searchParamsCache,+} from "./search-params";const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });-const DEFAULT_QUANTILE = "p95";-const DEFAULT_INTERVAL = "30m";-const DEFAULT_PERIOD = "1d";--const periods = ["1d", "7d"] as const; // satisfies Period[]--/**- * allowed URL search params- */-const searchParamsSchema = z.object({- statusCode: z.coerce.number().optional(),- cronTimestamp: z.coerce.number().optional(),- quantile: z.enum(quantiles).optional().default(DEFAULT_QUANTILE),- interval: z.enum(intervals).optional().default(DEFAULT_INTERVAL),- period: z.enum(periods).optional().default(DEFAULT_PERIOD),- regions: z- .string()- .optional()- .transform(- (value) =>- value- ?.trim()- ?.split(",")- .filter((i) => flyRegions.includes(i as Region)) ?? [],- ),-});-export default async function Page({params,searchParams,@@ -58,18 +33,16 @@ export default async function Page({searchParams: { [key: string]: string | string[] | undefined };}) {const id = params.id;- const search = searchParamsSchema.safeParse(searchParams);+ const search = searchParamsCache.parse(searchParams);const preferredSettings = getPreferredSettings();const monitor = await api.monitor.getPublicMonitorById.query({id: Number(id),});- if (!monitor || !search.success) {- return notFound();- }+ if (!monitor) return notFound();- const { period, quantile, interval, regions } = search.data;+ const { period, quantile, interval, regions } = search;// TODO: work it out easierconst intervalMinutes = getMinutesByInterval(interval);diff --git a/apps/web/src/app/public/monitors/[id]/search-params.ts b/apps/web/src/app/public/monitors/[id]/search-params.tsnew file mode 100644index 000000000..d68907c87--- /dev/null+++ b/apps/web/src/app/public/monitors/[id]/search-params.ts@@ -0,0 +1,26 @@+import { intervals, quantiles } from "@/lib/monitor/utils";+import { flyRegions } from "@openstatus/db/src/schema/constants";+import {+ createSearchParamsCache,+ parseAsArrayOf,+ parseAsInteger,+ parseAsStringLiteral,+} from "nuqs/server";++export const DEFAULT_QUANTILE = "p95";+export const DEFAULT_INTERVAL = "30m";+export const DEFAULT_PERIOD = "1d";++export const periods = ["1d", "7d"] as const;++export const searchParamsParsers = {+ statusCode: parseAsInteger,+ cronTimestamp: parseAsInteger,+ quantile: parseAsStringLiteral(quantiles).withDefault(DEFAULT_QUANTILE),+ interval: parseAsStringLiteral(intervals).withDefault(DEFAULT_INTERVAL),+ period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),+ regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault([+ ...flyRegions,+ ]),+};+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/status-page/[domain]/events/page.tsx b/apps/web/src/app/status-page/[domain]/events/page.tsxindex 8d58880bb..89ff1bb16 100644--- a/apps/web/src/app/status-page/[domain]/events/page.tsx+++ b/apps/web/src/app/status-page/[domain]/events/page.tsx@@ -3,13 +3,9 @@ import { SearchParamsPreset } from "@/components/monitor-dashboard/search-paramsimport { Feed } from "@/components/status-page/feed";import { api } from "@/trpc/server";import { notFound } from "next/navigation";-import { z } from "zod";+import { searchParamsCache } from "./search-params";import { formatter } from "./utils";-const searchParamsSchema = z.object({- filter: z.enum(["all", "maintenances", "reports"]).optional().default("all"),-});-type Props = {params: { domain: string };searchParams: { [key: string]: string | string[] | undefined };@@ -18,13 +14,11 @@ type Props = {export const revalidate = 120;export default async function Page({ params, searchParams }: Props) {+ const { filter } = searchParamsCache.parse(searchParams);const page = await api.page.getPageBySlug.query({ slug: params.domain });- const search = searchParamsSchema.safeParse(searchParams);if (!page) return notFound();- const filter = search.success ? search.data.filter : "all";-return (<div className="grid gap-8"><Headerdiff --git a/apps/web/src/app/status-page/[domain]/events/search-params.ts b/apps/web/src/app/status-page/[domain]/events/search-params.tsnew file mode 100644index 000000000..f8f52b7ac--- /dev/null+++ b/apps/web/src/app/status-page/[domain]/events/search-params.ts@@ -0,0 +1,8 @@+import { createSearchParamsCache, parseAsStringLiteral } from "nuqs/server";++export const searchParamsParsers = {+ filter: parseAsStringLiteral(["all", "maintenances", "reports"]).withDefault(+ "all",+ ),+};+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsxindex b9f7b3586..1c7f353c8 100644--- a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx+++ b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx@@ -1,6 +1,5 @@import { notFound } from "next/navigation";import * as React from "react";-import * as z from "zod";import { flyRegions } from "@openstatus/db/src/schema/constants";import type { Region } from "@openstatus/tinybird";@@ -13,43 +12,19 @@ import { ButtonReset } from "@/components/monitor-dashboard/button-reset";import { DatePickerPreset } from "@/components/monitor-dashboard/date-picker-preset";import { Metrics } from "@/components/monitor-dashboard/metrics";import { env } from "@/env";-import {- getMinutesByInterval,- intervals,- quantiles,-} from "@/lib/monitor/utils";+import { getMinutesByInterval } from "@/lib/monitor/utils";import { getPreferredSettings } from "@/lib/preferred-settings/server";import { api } from "@/trpc/server";+import {+ DEFAULT_INTERVAL,+ DEFAULT_PERIOD,+ DEFAULT_QUANTILE,+ periods,+ searchParamsCache,+} from "./search-params";const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });-const periods = ["1d", "7d"] as const; // satisfies Period[]--const DEFAULT_QUANTILE = "p95";-const DEFAULT_INTERVAL = "30m";-const DEFAULT_PERIOD = "7d";--/**- * allowed URL search params- */-const searchParamsSchema = z.object({- statusCode: z.coerce.number().optional(),- cronTimestamp: z.coerce.number().optional(),- quantile: z.enum(quantiles).optional().default(DEFAULT_QUANTILE),- interval: z.enum(intervals).optional().default(DEFAULT_INTERVAL),- period: z.enum(periods).optional().default(DEFAULT_PERIOD),- regions: z- .string()- .optional()- .transform(- (value) =>- value- ?.trim()- ?.split(",")- .filter((i) => flyRegions.includes(i as Region)) ?? [],- ),-});-export const revalidate = 120;export default async function Page({@@ -60,7 +35,7 @@ export default async function Page({searchParams: { [key: string]: string | string[] | undefined };}) {const id = params.id;- const search = searchParamsSchema.safeParse(searchParams);+ const search = searchParamsCache.parse(searchParams);const preferredSettings = getPreferredSettings();const monitor = await api.monitor.getPublicMonitorById.query({@@ -68,11 +43,9 @@ export default async function Page({slug: params.domain,});- if (!monitor || !search.success) {- return notFound();- }+ if (!monitor) return notFound();- const { period, quantile, interval, regions } = search.data;+ const { period, quantile, interval, regions } = search;// TODO: work it out easierconst intervalMinutes = getMinutesByInterval(interval);diff --git a/apps/web/src/app/status-page/[domain]/monitors/[id]/search-params.ts b/apps/web/src/app/status-page/[domain]/monitors/[id]/search-params.tsnew file mode 100644index 000000000..d68907c87--- /dev/null+++ b/apps/web/src/app/status-page/[domain]/monitors/[id]/search-params.ts@@ -0,0 +1,26 @@+import { intervals, quantiles } from "@/lib/monitor/utils";+import { flyRegions } from "@openstatus/db/src/schema/constants";+import {+ createSearchParamsCache,+ parseAsArrayOf,+ parseAsInteger,+ parseAsStringLiteral,+} from "nuqs/server";++export const DEFAULT_QUANTILE = "p95";+export const DEFAULT_INTERVAL = "30m";+export const DEFAULT_PERIOD = "1d";++export const periods = ["1d", "7d"] as const;++export const searchParamsParsers = {+ statusCode: parseAsInteger,+ cronTimestamp: parseAsInteger,+ quantile: parseAsStringLiteral(quantiles).withDefault(DEFAULT_QUANTILE),+ interval: parseAsStringLiteral(intervals).withDefault(DEFAULT_INTERVAL),+ period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),+ regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault([+ ...flyRegions,+ ]),+};+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/app/status-page/[domain]/monitors/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/page.tsxindex 7efa96818..beb396ce6 100644--- a/apps/web/src/app/status-page/[domain]/monitors/page.tsx+++ b/apps/web/src/app/status-page/[domain]/monitors/page.tsx@@ -1,7 +1,6 @@import { ChevronRight } from "lucide-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/src/components/button";@@ -11,19 +10,11 @@ import { Header } from "@/components/dashboard/header";import { SimpleChart } from "@/components/monitor-charts/simple-chart";import { groupDataByTimestamp } from "@/components/monitor-charts/utils";import { env } from "@/env";-import { quantiles } from "@/lib/monitor/utils";import { api } from "@/trpc/server";+import { searchParamsCache } from "./search-params";// Add loading page-/**- * allowed URL search params- */-const searchParamsSchema = z.object({- quantile: z.enum(quantiles).optional().default("p95"),- period: z.enum(["7d"]).optional().default("7d"),-});-const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });export const revalidate = 120;@@ -36,10 +27,9 @@ export default async function Page({searchParams: { [key: string]: string | string[] | undefined };}) {const page = await api.page.getPageBySlug.query({ slug: params.domain });- const search = searchParamsSchema.safeParse(searchParams);- if (!page || !search.success) notFound();+ const { quantile, period } = searchParamsCache.parse(searchParams);- const { quantile, period } = search.data;+ if (!page) notFound();// filter monitor by public or notdiff --git a/apps/web/src/app/status-page/[domain]/monitors/search-params.ts b/apps/web/src/app/status-page/[domain]/monitors/search-params.tsnew file mode 100644index 000000000..454af43aa--- /dev/null+++ b/apps/web/src/app/status-page/[domain]/monitors/search-params.ts@@ -0,0 +1,8 @@+import { quantiles } from "@/lib/monitor/utils";+import { createSearchParamsCache, parseAsStringLiteral } from "nuqs/server";++export const searchParamsParsers = {+ quantile: parseAsStringLiteral(quantiles).withDefault("p95"),+ period: parseAsStringLiteral(["7d"]).withDefault("7d"),+};+export const searchParamsCache = createSearchParamsCache(searchParamsParsers);diff --git a/apps/web/src/components/data-table/data-table-date-ranger-picker.tsx b/apps/web/src/components/data-table/data-table-date-ranger-picker.tsxdeleted file mode 100644index 8c10318b3..000000000--- a/apps/web/src/components/data-table/data-table-date-ranger-picker.tsx+++ /dev/null@@ -1,93 +0,0 @@-"use client";--import { format } from "date-fns";-import { Calendar as CalendarIcon } from "lucide-react";-import { usePathname, useRouter, useSearchParams } from "next/navigation";-import * as React from "react";-import type { DateRange } from "react-day-picker";--import {- Button,- Calendar,- Popover,- PopoverContent,- PopoverTrigger,-} from "@openstatus/ui";--import useUpdateSearchParams from "@/hooks/use-update-search-params";-import { cn, manipulateDate } from "@/lib/utils";--type DataTableDateRangePicker = React.HTMLAttributes<HTMLDivElement>;--export function DataTableDateRangePicker({- className,-}: DataTableDateRangePicker) {- const router = useRouter();- const pathname = usePathname();- const searchParams = useSearchParams();- const updateSearchParams = useUpdateSearchParams();- const [date, setDate] = React.useState<DateRange | undefined>();-- React.useEffect(() => {- if (searchParams) {- const from =- (searchParams.has("fromDate") && searchParams.get("fromDate")) ||- undefined;- const to =- (searchParams.has("toDate") && searchParams.get("toDate")) || undefined;- setDate({- from: from ? new Date(Number(from)) : undefined,- to: to ? new Date(Number(to)) : undefined,- });- }- }, [searchParams]);-- return (- <div className={cn("grid gap-2", className)}>- <Popover>- <PopoverTrigger asChild>- <Button- id="date"- variant="outline"- className={cn(- "w-[260px] justify-start text-left font-normal",- !date && "text-muted-foreground",- )}- >- <CalendarIcon className="mr-2 h-4 w-4" />- {date?.from ? (- date.to ? (- <>- {format(date.from, "LLL dd, y")} -{" "}- {format(date.to, "LLL dd, y")}- </>- ) : (- format(date.from, "LLL dd, y")- )- ) : (- <span>Pick a date</span>- )}- </Button>- </PopoverTrigger>- <PopoverContent className="w-auto p-0" align="start">- <Calendar- initialFocus- mode="range"- defaultMonth={date?.from}- selected={date}- onSelect={(value) => {- setDate(value);- const { fromDate, toDate } = manipulateDate(value);-- const searchParams = updateSearchParams({- fromDate,- toDate,- });- router.replace(`${pathname}?${searchParams}`);- }}- />- </PopoverContent>- </Popover>- </div>- );-}diff --git a/apps/web/src/components/data-table/data-table-faceted-filter.tsx b/apps/web/src/components/data-table/data-table-faceted-filter.tsxindex 8177d287c..d24765b8e 100644--- a/apps/web/src/components/data-table/data-table-faceted-filter.tsx+++ b/apps/web/src/components/data-table/data-table-faceted-filter.tsx@@ -1,4 +1,4 @@-import { useRouter } from "next/navigation";+"use client";import {Badge,@@ -18,8 +18,8 @@ import {import type { Column } from "@tanstack/react-table";import { Check, PlusCircle } from "lucide-react";-import useUpdateSearchParams from "@/hooks/use-update-search-params";import { cn } from "@/lib/utils";+import { useQueryState } from "nuqs";interface DataTableFacetedFilter<TData, TValue> {column?: Column<TData, TValue>;@@ -36,21 +36,15 @@ export function DataTableFacetedFilter<TData, TValue>({title,options,}: DataTableFacetedFilter<TData, TValue>) {- const router = useRouter();- const updateSearchParams = useUpdateSearchParams();+ // REMINDER: should have a default value for the column+ if (!column) throw new Error("Column is required.");- const facets = column?.getFacetedUniqueValues();+ const [_, setValue] = useQueryState(column.id, { shallow: false });+ const facets = column.getFacetedUniqueValues();const selectedValues = new Set(- column?.getFilterValue() as (string | number | boolean)[],+ column.getFilterValue() as (string | number | boolean)[],);- const updatePageSearchParams = (- values: Record<string, number | string | null>,- ) => {- const newSearchParams = updateSearchParams(values);- router.replace(`?${newSearchParams}`, { scroll: false });- };-return (<Popover><PopoverTrigger asChild>@@ -110,17 +104,10 @@ export function DataTableFacetedFilter<TData, TValue>({selectedValues.add(option.value);}const filterValues = Array.from(selectedValues);- column?.setFilterValue(+ column.setFilterValue(filterValues.length ? filterValues : undefined,);-- // update search params- const key = column?.id;- if (key) {- updatePageSearchParams({- [key]: filterValues?.join(",") || null,- });- }+ setValue(filterValues?.join(",") || null);}}><div@@ -151,7 +138,7 @@ export function DataTableFacetedFilter<TData, TValue>({<CommandSeparator /><CommandGroup><CommandItem- onSelect={() => column?.setFilterValue(undefined)}+ onSelect={() => column.setFilterValue(undefined)}className="justify-center text-center">Clear filtersdiff --git a/apps/web/src/components/data-table/data-table-pagination.tsx b/apps/web/src/components/data-table/data-table-pagination.tsxindex e9c8e4885..bb3be7b6f 100644--- a/apps/web/src/components/data-table/data-table-pagination.tsx+++ b/apps/web/src/components/data-table/data-table-pagination.tsx@@ -7,7 +7,6 @@ import {ChevronsLeft,ChevronsRight,} from "lucide-react";-import { useRouter } from "next/navigation";import {Button,@@ -18,7 +17,7 @@ import {SelectValue,} from "@openstatus/ui";-import useUpdateSearchParams from "@/hooks/use-update-search-params";+import { parseAsInteger, useQueryStates } from "nuqs";// REMINDER: pageIndex pagination issue - jumping back to 0 after change@@ -29,15 +28,10 @@ interface DataTablePaginationProps<TData> {export function DataTablePagination<TData>({table,}: DataTablePaginationProps<TData>) {- const updateSearchParams = useUpdateSearchParams();- const router = useRouter();-- const updatePageSearchParams = (- values: Record<string, number | string | null>,- ) => {- const newSearchParams = updateSearchParams(values);- router.replace(`?${newSearchParams}`, { scroll: false });- };+ const [{ pageSize }, setSearchParams] = useQueryStates({+ pageSize: parseAsInteger.withDefault(10),+ // pageIndex: parseAsInteger.withDefault(0),+ });return (<div className="flex items-center justify-between px-2">@@ -53,7 +47,7 @@ export function DataTablePagination<TData>({value={`${table.getState().pagination.pageSize}`}onValueChange={(value) => {table.setPageSize(Number(value));- updatePageSearchParams({ pageSize: value });+ setSearchParams({ pageSize: Number(value) });}}><SelectTrigger className="h-8 w-[70px]">diff --git a/apps/web/src/components/data-table/data-table-toolbar.tsx b/apps/web/src/components/data-table/data-table-toolbar.tsxindex b19a710f5..5117dd515 100644--- a/apps/web/src/components/data-table/data-table-toolbar.tsx+++ b/apps/web/src/components/data-table/data-table-toolbar.tsx@@ -2,13 +2,12 @@import type { Table } from "@tanstack/react-table";import { X } from "lucide-react";-import { useRouter } from "next/navigation";+import { useRouter, useSearchParams } from "next/navigation";import { Button } from "@openstatus/ui/src/components/button";import { flyRegionsDict } from "@openstatus/utils";import { codesDict } from "@/data/code-dictionary";-import useUpdateSearchParams from "@/hooks/use-update-search-params";import { DataTableFacetedFilter } from "./data-table-faceted-filter";import { DataTableFacetedInputDropdown } from "./data-table-faceted-input-dropdown";@@ -20,7 +19,7 @@ export function DataTableToolbar<TData>({table,}: DataTableToolbarProps<TData>) {const router = useRouter();- const updateSearchParams = useUpdateSearchParams();+ const searchParams = useSearchParams();const isFiltered = table.getState().columnFilters.length > 0;return (@@ -75,17 +74,13 @@ export function DataTableToolbar<TData>({<Buttonvariant="ghost"onClick={() => {+ const period = searchParams.get("period");table.resetColumnFilters();-- // reset filter search params (but not period e.g.)- const newSearchParams = updateSearchParams({- error: null,- statusCode: null,- region: null,- });- router.replace(`?${newSearchParams}`, {- scroll: false,- });+ if (period) {+ router.replace(`?period=${period}`, {+ scroll: false,+ });+ }}}className="h-8 px-2 lg:px-3">diff --git a/apps/web/src/components/data-table/monitor/data-table-pagination.tsx b/apps/web/src/components/data-table/monitor/data-table-pagination.tsxindex 91e3db192..ff5798620 100644--- a/apps/web/src/components/data-table/monitor/data-table-pagination.tsx+++ b/apps/web/src/components/data-table/monitor/data-table-pagination.tsx@@ -7,7 +7,6 @@ import {ChevronsLeft,ChevronsRight,} from "lucide-react";-import { useRouter } from "next/navigation";import {Button,@@ -18,7 +17,7 @@ import {SelectValue,} from "@openstatus/ui";-import useUpdateSearchParams from "@/hooks/use-update-search-params";+import { parseAsInteger, useQueryStates } from "nuqs";// REMINDER: pageIndex pagination issue - jumping back to 0 after change@@ -29,15 +28,10 @@ interface DataTablePaginationProps<TData> {export function DataTablePagination<TData>({table,}: DataTablePaginationProps<TData>) {- const updateSearchParams = useUpdateSearchParams();- const router = useRouter();-- const updatePageSearchParams = (- values: Record<string, number | string | null>,- ) => {- const newSearchParams = updateSearchParams(values);- router.replace(`?${newSearchParams}`, { scroll: false });- };+ const [{ pageSize }, setSearchParams] = useQueryStates({+ pageSize: parseAsInteger.withDefault(10),+ // pageIndex: parseAsInteger.withDefault(0),+ });return (<div className="flex flex-wrap-reverse items-center justify-between gap-4 px-2">@@ -54,7 +48,7 @@ export function DataTablePagination<TData>({value={`${table.getState().pagination.pageSize}`}onValueChange={(value) => {table.setPageSize(Number(value));- updatePageSearchParams({ pageSize: value });+ setSearchParams({ pageSize: Number(value) });}}><SelectTrigger className="h-8 w-[70px]">diff --git a/apps/web/src/components/forms/status-page/form.tsx b/apps/web/src/components/forms/status-page/form.tsxindex b95d96332..6483def9e 100644--- a/apps/web/src/components/forms/status-page/form.tsx+++ b/apps/web/src/components/forms/status-page/form.tsx@@ -21,7 +21,6 @@ import {TabsTrigger,} from "@/components/dashboard/tabs";import { useDebounce } from "@/hooks/use-debounce";-import useUpdateSearchParams from "@/hooks/use-update-search-params";import { toast, toastAction } from "@/lib/toast";import { slugify } from "@/lib/utils";import { api } from "@/trpc/client";@@ -80,7 +79,6 @@ export function StatusPageForm({const watchSlug = form.watch("slug");const watchTitle = form.watch("title");const debouncedSlug = useDebounce(watchSlug, 1000); // using debounce to not exhaust the server- const updateSearchParams = useUpdateSearchParams();const checkUniqueSlug = useCallback(async () => {const isUnique = await api.page.getSlugUniqueness.query({@@ -125,9 +123,7 @@ export function StatusPageForm({if (defaultValues) {await api.page.update.mutate(props);} else {- const page = await api.page.create.mutate(props);- const id = page?.id || null;- router.replace(`?${updateSearchParams({ id })}`); // to stay on same page and enable 'Advanced' tab+ await api.page.create.mutate(props);}toast.success("Saved successfully.", {diff --git a/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsx b/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsxindex 82b56b7c7..ac7501158 100644--- a/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsx+++ b/apps/web/src/components/marketing/pricing/pricing-plan-radio.tsx@@ -7,22 +7,20 @@ import {RadioGroup,RadioGroupItem,} from "@openstatus/ui/src/components/radio-group";-import { useRouter } from "next/navigation";-import useUpdateSearchParams from "@/hooks/use-update-search-params";import { cn } from "@/lib/utils";+import type { WorkspacePlan } from "@openstatus/db/src/schema";-export function PricingPlanRadio() {- const updateSearchParams = useUpdateSearchParams();- const router = useRouter();+export function PricingPlanRadio({+ onChange,+}: {+ onChange(value: WorkspacePlan): void;+}) {return (<RadioGroupdefaultValue="team"className="grid grid-cols-4 gap-4"- onValueChange={(value) => {- const searchParams = updateSearchParams({ plan: value });- router.replace(`?${searchParams}`, { scroll: false });- }}+ onValueChange={onChange}>{workspacePlans.map((key) => (<div key={key}>@@ -34,7 +32,7 @@ export function PricingPlanRadio() {key === "team" && "bg-muted/50",)}>- <span className="text-sm capitalize">{key}</span>+ <span className="text-sm capitalize">{allPlans[key].title}</span><span className="mt-1 font-light text-muted-foreground text-xs">{allPlans[key].price}€/month</span>diff --git a/apps/web/src/components/marketing/pricing/pricing-wrapper.tsx b/apps/web/src/components/marketing/pricing/pricing-wrapper.tsxindex 9aefd5657..b49854c9d 100644--- a/apps/web/src/components/marketing/pricing/pricing-wrapper.tsx+++ b/apps/web/src/components/marketing/pricing/pricing-wrapper.tsx@@ -4,19 +4,22 @@ import { useSearchParams } from "next/navigation";import type { WorkspacePlan } from "@openstatus/db/src/schema/workspaces/validation";+import { workspacePlans } from "@openstatus/db/src/schema";+import { parseAsStringLiteral, useQueryState } from "nuqs";import { Suspense } from "react";import { PricingPlanRadio } from "./pricing-plan-radio";import { PricingTable } from "./pricing-table";export function PricingWrapper() {- const searchParams = useSearchParams();+ const [plan, setPlan] = useQueryState(+ "plan",+ parseAsStringLiteral(workspacePlans).withDefault("team"),+ );return (<div><div className="flex flex-col gap-4 sm:hidden">- <PricingPlanRadio />- <PricingTable- plans={[(searchParams.get("plan") as WorkspacePlan) || "team"]}- />+ <PricingPlanRadio onChange={setPlan} />+ <PricingTable plans={[plan]} /></div><div className="hidden sm:block"><PricingTable />diff --git a/apps/web/src/components/monitor-dashboard/region-preset.tsx b/apps/web/src/components/monitor-dashboard/region-preset.tsxindex c319d15e4..76ca53ca5 100644--- a/apps/web/src/components/monitor-dashboard/region-preset.tsx+++ b/apps/web/src/components/monitor-dashboard/region-preset.tsx@@ -1,7 +1,6 @@"use client";import { Check, ChevronsUpDown, Globe2 } from "lucide-react";-import { usePathname, useRouter } from "next/navigation";import * as React from "react";import type { Region } from "@openstatus/tinybird";@@ -26,8 +25,9 @@ import {flyRegionsDict,} from "@openstatus/utils";-import useUpdateSearchParams from "@/hooks/use-update-search-params";import { cn } from "@/lib/utils";+import { flyRegions } from "@openstatus/db/src/schema/constants";+import { parseAsArrayOf, parseAsStringLiteral, useQueryState } from "nuqs";interface RegionsPresetProps extends ButtonProps {regions: Region[];@@ -40,44 +40,39 @@ export function RegionsPreset({className,...props}: RegionsPresetProps) {- const [selected, setSelected] = React.useState<Region[]>(- selectedRegions.filter((r) => regions.includes(r)),- ); // REMINDER: init without regions that failed to load- const router = useRouter();- const pathname = usePathname();- const updateSearchParams = useUpdateSearchParams();+ // TODO: check with the RSC pages+ const [selected, setSelected] = useQueryState(+ "regions",+ parseAsArrayOf(parseAsStringLiteral(flyRegions))+ .withDefault(selectedRegions.filter((r) => regions?.includes(r)))+ .withOptions({+ shallow: false, // required for SSR to call the RSC+ }),+ );const allSelected = regions.every((r) => selected.includes(r));- React.useEffect(() => {- if (!allSelected) {- const searchParams = updateSearchParams({ regions: selected.join(",") });- router.replace(`${pathname}?${searchParams}`, { scroll: false });- } else if (allSelected) {- const searchParams = updateSearchParams({ regions: null });- router.replace(`${pathname}?${searchParams}`, { scroll: false });- }- }, [allSelected, router, pathname, updateSearchParams, selected]);-- const regionsByContinent = regions.reduce(- (prev, curr) => {- const region = flyRegionsDict[curr];+ const regionsByContinent = regions+ .reduce(+ (prev, curr) => {+ const region = flyRegionsDict[curr];- const item = prev.find((r) => r.continent === region.continent);+ const item = prev.find((r) => r.continent === region.continent);- if (item) {- item.data.push(region);- } else {- prev.push({- continent: region.continent,- data: [region],- });- }+ if (item) {+ item.data.push(region);+ } else {+ prev.push({+ continent: region.continent,+ data: [region],+ });+ }- return prev;- },- [] as { continent: Continent; data: RegionInfo[] }[],- );+ return prev;+ },+ [] as { continent: Continent; data: RegionInfo[] }[],+ )+ .sort((a, b) => a.continent.localeCompare(b.continent));return (<Popover>diff --git a/apps/web/src/components/monitor-dashboard/search-params-preset.tsx b/apps/web/src/components/monitor-dashboard/search-params-preset.tsxindex 4fb2fbd81..75ea072b0 100644--- a/apps/web/src/components/monitor-dashboard/search-params-preset.tsx+++ b/apps/web/src/components/monitor-dashboard/search-params-preset.tsx@@ -7,13 +7,12 @@ import {SelectTrigger,SelectValue,} from "@openstatus/ui/src/components/select";-import { usePathname, useRouter } from "next/navigation";import type { ReactNode } from "react";import { Icons } from "@/components/icons";import type { ValidIcon } from "@/components/icons";-import useUpdateSearchParams from "@/hooks/use-update-search-params";import { cn } from "@/lib/utils";+import { useQueryState } from "nuqs";export function SearchParamsPreset<T extends string>({disabled,@@ -27,28 +26,22 @@ export function SearchParamsPreset<T extends string>({}: {disabled?: boolean;defaultValue?: T;- values: readonly T[];+ values: readonly T[] | T[];searchParam: string;icon?: ValidIcon;placeholder?: string;formatter?(value: T): ReactNode;className?: string;}) {- const router = useRouter();- const pathname = usePathname();- const updateSearchParams = useUpdateSearchParams();-- function onSelect(value: T) {- const searchParams = updateSearchParams({ [searchParam]: value });- router.replace(`${pathname}?${searchParams}`, { scroll: false });- }+ const [value, setValue] = useQueryState(searchParam, { shallow: false });const Icon = icon ? Icons[icon] : undefined;return (<SelectdefaultValue={defaultValue}- onValueChange={onSelect}+ value={value || defaultValue}+ onValueChange={setValue}disabled={disabled}><SelectTriggerdiff --git a/apps/web/src/components/ping-response-analysis/select-region.tsx b/apps/web/src/components/ping-response-analysis/select-region.tsxdeleted file mode 100644index 413ff525d..000000000--- a/apps/web/src/components/ping-response-analysis/select-region.tsx+++ /dev/null@@ -1,59 +0,0 @@-"use client";--import { usePathname, useRouter } from "next/navigation";--import type { MonitorFlyRegion } from "@openstatus/db/src/schema/constants";-import { flyRegions } from "@openstatus/db/src/schema/constants";-import { Label } from "@openstatus/ui/src/components/label";-import {- Select,- SelectContent,- SelectItem,- SelectTrigger,- SelectValue,-} from "@openstatus/ui/src/components/select";--import useUpdateSearchParams from "@/hooks/use-update-search-params";-import { regionFormatter } from "./utils";--export function SelectRegion({- defaultValue,-}: {- defaultValue?: MonitorFlyRegion;-}) {- const router = useRouter();- const pathname = usePathname();- const updateSearchParams = useUpdateSearchParams();-- function onSelect(value: string) {- const searchParams = updateSearchParams({ region: value });- router.replace(`${pathname}?${searchParams}`, { scroll: false });- }-- return (- <div className="grid gap-1.5">- <Label htmlFor="region">Region</Label>- <Select onValueChange={onSelect} defaultValue={defaultValue}>- <SelectTrigger- id="region"- name="region"- className="w-full sm:w-[240px]"- >- <span className="flex items-center gap-2">- <SelectValue />- </span>- </SelectTrigger>- <SelectContent>- {flyRegions.map((region) => (- <SelectItem key={region} value={region}>- {regionFormatter(region, "long")}- </SelectItem>- ))}- </SelectContent>- </Select>- <p className="text-muted-foreground text-sm">- Select a region to inspect closer- </p>- </div>- );-}diff --git a/apps/web/src/hooks/use-update-search-params.ts b/apps/web/src/hooks/use-update-search-params.tsindex 10fcb3162..ce9faab87 100644--- a/apps/web/src/hooks/use-update-search-params.ts+++ b/apps/web/src/hooks/use-update-search-params.ts@@ -1,6 +1,10 @@import { useSearchParams } from "next/navigation";import * as React from "react";+/**+ *+ * @deprecated use `nuqs` instead+ */export default function useUpdateSearchParams() {const searchParams = useSearchParams();diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex c7fa97211..7191e60e9 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -401,6 +401,9 @@ importers:next-themes:specifier: 0.2.1version: 0.2.1([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))([email protected]([email protected]))([email protected])+ nuqs:+ specifier: 1.19.1+ version: 1.19.1([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected]))posthog-js:specifier: 1.136.1version: 1.136.1@@ -8234,6 +8237,9 @@ packages:resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}engines: {node: '>= 8'}+ resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}+resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}@@ -8476,6 +8482,11 @@ packages:resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}+ resolution: {integrity: sha512-oixldNThB1wbu6B5K961++7wpTz/EZFPWnraGmIQhibDT+YxRJNplWMIoPJgL4dlsiSDVI5bbUWKpzsIWVh3Pg==}+ peerDependencies:+ next: '>=13.4 <14.0.2 || ^14.0.3'+resolution: {integrity: sha512-BI2SdqqTHg2d4wJh8P9A1W+bslg33vOE9IZDY6eR2QC+Pu1iNBVZUqczrd43rJb+fMzHU7ltAYKsEFY/kHMFcw==}engines: {node: ^14.16.0 || >=16.10.0}@@ -19222,6 +19233,8 @@ snapshots:minipass: 3.3.6yallist: 4.0.0+ [email protected]: {}+@@ -19502,6 +19515,11 @@ snapshots:dependencies:path-key: 4.0.0+ [email protected]([email protected](@opentelemetry/[email protected])([email protected]([email protected]))([email protected])):+ dependencies:+ mitt: 3.0.1+ next: 14.2.4(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])+dependencies:citty: 0.1.6