Skip to content

Open-source status page, incident response and uptime monitoring

refactor: move monitor dashboard files (#758)

Maximilian Kaske0cf3dbb59b84
diff --git a/apps/web/src/app/api/checker/test/route.ts b/apps/web/src/app/api/checker/test/route.ts
index 035e1c293..a671908e3 100644
--- a/apps/web/src/app/api/checker/test/route.ts
+++ b/apps/web/src/app/api/checker/test/route.ts
@@ -3,7 +3,7 @@ import { z } from "zod";
import { monitorFlyRegionSchema } from "@openstatus/db/src/schema";
-import { checkRegion } from "@/app/play/checker/[id]/utils"; // TODO: move into a shared package
+import { checkRegion } from "@/components/ping-response-analysis/utils";
import { payloadSchema } from "../schema";
import { isAnInvalidTestUrl } from "../utils";
diff --git a/apps/web/src/app/api/og/checker/route.tsx b/apps/web/src/app/api/og/checker/route.tsx
index e7e4f6612..c2af20026 100644
--- a/apps/web/src/app/api/og/checker/route.tsx
+++ b/apps/web/src/app/api/og/checker/route.tsx
@@ -4,7 +4,7 @@ import {
getCheckerDataById,
regionFormatter,
timestampFormatter,
-} from "@/app/play/checker/[id]/utils";
+} from "@/components/ping-response-analysis/utils";
import { cn } from "@/lib/utils";
import { BasicLayout } from "../_components/basic-layout";
import {
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/monitor-informations.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/monitor-informations.tsx
deleted file mode 100644
index 6b69234bc..000000000
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/monitor-informations.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { MonitorPeriodicity } from "@openstatus/db/src/schema";
-
-import { MetricsCard } from "./metrics-card";
-
-export function MonitorInformations({
- periodicity,
-}: {
- periodicity: MonitorPeriodicity;
-}) {
- return <div className="flex flex-wrap gap-4 md:gap-6"></div>;
-}
-
-const periodicityDict = {
- "30s": {
- value: 30,
- unit: "seconds",
- },
- "1m": {
- value: 1,
- unit: "minute",
- },
- "5m": {
- value: 5,
- unit: "minutes",
- },
- "10m": {
- value: 10,
- unit: "minutes",
- },
- "30m": {
- value: 30,
- unit: "minutes",
- },
- "1h": {
- value: 1,
- unit: "hour",
- },
- other: {
- value: 0,
- unit: "",
- },
-} satisfies Record<MonitorPeriodicity, { value: number; unit: string }>;
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
index b3fe36202..bf2e096da 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
@@ -13,11 +13,11 @@ import type {
import * as assertions from "@openstatus/assertions";
import type { OSTinybird } from "@openstatus/tinybird";
-import { ResponseDetailTabs } from "@/app/play/checker/[id]/_components/response-detail-tabs";
import { CopyToClipboardButton } from "@/components/dashboard/copy-to-clipboard-button";
import { columns } from "@/components/data-table/columns";
import { DataTable } from "@/components/data-table/data-table";
import { LoadingAnimation } from "@/components/loading-animation";
+import { ResponseDetailTabs } from "@/components/ping-response-analysis/response-detail-tabs";
import { api } from "@/trpc/client";
// EXAMPLE: get the type of the response of the endpoint
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.tsx
index c405d1828..d83b738be 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,14 +1,13 @@
import * as React from "react";
import { notFound } from "next/navigation";
-import { format } from "date-fns";
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 { DatePickerPreset } from "../_components/date-picker-preset";
-import { periods } from "../utils";
import { DataTableWrapper } from "./_components/data-table-wrapper";
import { DownloadCSVButton } from "./_components/download-csv-button";
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.tsx
index 2767d8822..ba9a72df9 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
@@ -5,8 +5,8 @@ import { Button } from "@openstatus/ui";
import { flyRegions } from "@openstatus/utils";
import { EmptyState } from "@/components/dashboard/empty-state";
+import { ResponseDetails } from "@/components/monitor-dashboard/response-details";
import { api } from "@/trpc/server";
-import { ResponseDetails } from "../_components/response-details";
//
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.tsx
index ae739b6ec..a40075c91 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
@@ -7,16 +7,19 @@ import type { Region } from "@openstatus/tinybird";
import { OSTinybird } from "@openstatus/tinybird";
import { Separator } from "@openstatus/ui";
+import { CombinedChartWrapper } from "@/components/monitor-charts/combined-chart-wrapper";
+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 { getPreferredSettings } from "@/lib/preferred-settings/server";
import { api } from "@/trpc/server";
-import { ButtonReset } from "../_components/button-reset";
-import { DatePickerPreset } from "../_components/date-picker-preset";
-import { Metrics } from "../_components/metrics";
-import { getMinutesByInterval, intervals, periods, quantiles } from "../utils";
-import { CombinedChartWrapper } from "./_components/combined-chart-wrapper";
-
-// import { groupDataByTimestamp } from "./_components/utils";
const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });
diff --git a/apps/web/src/app/play/checker/[id]/page.tsx b/apps/web/src/app/play/checker/[id]/page.tsx
index 90b8a3c65..6bedaa784 100644
--- a/apps/web/src/app/play/checker/[id]/page.tsx
+++ b/apps/web/src/app/play/checker/[id]/page.tsx
@@ -13,12 +13,15 @@ import {
} from "@/app/shared-metadata";
import { Shell } from "@/components/dashboard/shell";
import { BackButton } from "@/components/layout/back-button";
-import { CopyLinkButton } from "./_components/copy-link-button";
-import { MultiRegionTabs } from "./_components/multi-region-tabs";
-import { RegionInfo } from "./_components/region-info";
-import { ResponseDetailTabs } from "./_components/response-detail-tabs";
-import { SelectRegion } from "./_components/select-region";
-import { getCheckerDataById, timestampFormatter } from "./utils";
+import { CopyLinkButton } from "@/components/ping-response-analysis/copy-link-button";
+import { MultiRegionTabs } from "@/components/ping-response-analysis/multi-region-tabs";
+import { RegionInfo } from "@/components/ping-response-analysis/region-info";
+import { ResponseDetailTabs } from "@/components/ping-response-analysis/response-detail-tabs";
+import { SelectRegion } from "@/components/ping-response-analysis/select-region";
+import {
+ getCheckerDataById,
+ timestampFormatter,
+} from "@/components/ping-response-analysis/utils";
/**
* allowed URL search params
diff --git a/apps/web/src/app/play/checker/api/route.ts b/apps/web/src/app/play/checker/api/route.ts
index b514736c2..5230ce17e 100644
--- a/apps/web/src/app/play/checker/api/route.ts
+++ b/apps/web/src/app/play/checker/api/route.ts
@@ -1,4 +1,4 @@
-import { setCheckerData } from "../[id]/utils";
+import { setCheckerData } from "@/components/ping-response-analysis/utils";
export const runtime = "edge";
diff --git a/apps/web/src/components/content/mdx-components.tsx b/apps/web/src/components/content/mdx-components.tsx
index 39e5d3354..3e442567e 100644
--- a/apps/web/src/components/content/mdx-components.tsx
+++ b/apps/web/src/components/content/mdx-components.tsx
@@ -15,8 +15,8 @@ import {
TableRow,
} from "@openstatus/ui";
-import { MetricsCard } from "@/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics-card";
-import type { MetricsCardProps } from "@/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics-card";
+import type { MetricsCardProps } from "../monitor-dashboard/metrics-card";
+import { MetricsCard } from "../monitor-dashboard/metrics-card";
import type { SimpleChartProps } from "./simple-chart";
import { SimpleChart } from "./simple-chart";
diff --git a/apps/web/src/components/content/simple-chart.tsx b/apps/web/src/components/content/simple-chart.tsx
index 0e556ebe0..03ab3c70d 100644
--- a/apps/web/src/components/content/simple-chart.tsx
+++ b/apps/web/src/components/content/simple-chart.tsx
@@ -2,8 +2,8 @@
import { useEffect, useState } from "react";
-import type { RegionTableProps } from "@/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/region-table";
-import { RegionTable } from "@/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/region-table";
+import type { RegionTableProps } from "@/components/monitor-charts/region-table";
+import { RegionTable } from "@/components/monitor-charts/region-table";
export interface SimpleChartProps {
staticFile: string;
diff --git a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
index 8e7d7cc25..f7d6e4ab7 100644
--- a/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
+++ b/apps/web/src/components/data-table/monitor/data-table-row-actions.tsx
@@ -26,8 +26,8 @@ import {
DropdownMenuTrigger,
} from "@openstatus/ui";
-import type { RegionChecker } from "@/app/play/checker/[id]/utils";
import { LoadingAnimation } from "@/components/loading-animation";
+import type { RegionChecker } from "@/components/ping-response-analysis/utils";
import { toastAction } from "@/lib/toast";
import { api } from "@/trpc/client";
diff --git a/apps/web/src/components/forms/monitor-form.tsx b/apps/web/src/components/forms/monitor-form.tsx
index 972db44d2..fb5968f93 100644
--- a/apps/web/src/components/forms/monitor-form.tsx
+++ b/apps/web/src/components/forms/monitor-form.tsx
@@ -62,9 +62,9 @@ import {
} from "@openstatus/ui";
import { flyRegionsDict } from "@openstatus/utils";
-import type { RegionChecker } from "@/app/play/checker/[id]/utils";
import { LoadingAnimation } from "@/components/loading-animation";
import { FailedPingAlertConfirmation } from "@/components/modals/failed-ping-alert-confirmation";
+import type { RegionChecker } from "@/components/ping-response-analysis/utils";
import useUpdateSearchParams from "@/hooks/use-update-search-params";
import { toastAction } from "@/lib/toast";
import { cn } from "@/lib/utils";
diff --git a/apps/web/src/components/forms/monitor/form.tsx b/apps/web/src/components/forms/monitor/form.tsx
index 29b9d4338..28c518fc1 100644
--- a/apps/web/src/components/forms/monitor/form.tsx
+++ b/apps/web/src/components/forms/monitor/form.tsx
@@ -17,7 +17,6 @@ import type {
import { flyRegions, insertMonitorSchema } from "@openstatus/db/src/schema";
import { Badge, Form } from "@openstatus/ui";
-import type { RegionChecker } from "@/app/play/checker/[id]/utils";
import {
Tabs,
TabsContent,
@@ -25,6 +24,7 @@ import {
TabsTrigger,
} from "@/components/dashboard/tabs";
import { FailedPingAlertConfirmation } from "@/components/modals/failed-ping-alert-confirmation";
+import type { RegionChecker } from "@/components/ping-response-analysis/utils";
import { toast, toastAction } from "@/lib/toast";
import { formatDuration } from "@/lib/utils";
import { api } from "@/trpc/client";
diff --git a/apps/web/src/components/forms/monitor/request-test-button.tsx b/apps/web/src/components/forms/monitor/request-test-button.tsx
index 6519c8f1f..c5d131c72 100644
--- a/apps/web/src/components/forms/monitor/request-test-button.tsx
+++ b/apps/web/src/components/forms/monitor/request-test-button.tsx
@@ -25,10 +25,10 @@ import {
} from "@openstatus/ui";
import { flyRegions, flyRegionsDict } from "@openstatus/utils";
-import { RegionInfo } from "@/app/play/checker/[id]/_components/region-info";
-import { ResponseDetailTabs } from "@/app/play/checker/[id]/_components/response-detail-tabs";
-import type { RegionChecker } from "@/app/play/checker/[id]/utils";
import { LoadingAnimation } from "@/components/loading-animation";
+import { RegionInfo } from "@/components/ping-response-analysis/region-info";
+import { ResponseDetailTabs } from "@/components/ping-response-analysis/response-detail-tabs";
+import type { RegionChecker } from "@/components/ping-response-analysis/utils";
import { toast, toastAction } from "@/lib/toast";
interface Props {
diff --git a/apps/web/src/components/layout/header/app-header.tsx b/apps/web/src/components/layout/header/app-header.tsx
index b87eca25a..9f8e23362 100644
--- a/apps/web/src/components/layout/header/app-header.tsx
+++ b/apps/web/src/components/layout/header/app-header.tsx
@@ -2,17 +2,35 @@
import Link from "next/link";
import { UserButton, useUser } from "@clerk/nextjs";
+import { allChangelogs } from "contentlayer/generated";
import { ArrowUpRight } from "lucide-react";
import { Button, Skeleton } from "@openstatus/ui";
import { Shell } from "@/components/dashboard/shell";
-import { ChangelogViewedButton } from "@/components/workspace/changelog-viewed-button";
+import { useCookieState } from "@/hooks/use-cookie-state";
import { AppTabs } from "./app-tabs";
import { Breadcrumbs } from "./breadcrumbs";
+const lastChangelog = allChangelogs
+ .sort(
+ (a, b) =>
+ new Date(a.publishedAt).getTime() - new Date(b.publishedAt).getTime(),
+ )
+ .pop();
+
export function AppHeader() {
const { isLoaded, isSignedIn } = useUser();
+ const [lastViewed, setLastViewed] = useCookieState(
+ "last-viewed-changelog",
+ new Date(0).toISOString(),
+ );
+
+ const show =
+ lastChangelog && lastViewed
+ ? new Date(lastViewed) < new Date(lastChangelog.publishedAt)
+ : false;
+
return (
// TODO: discuss amount of top-3 and top-6
<header className="border-border sticky top-2 z-50 w-full">
@@ -23,7 +41,19 @@ export function AppHeader() {
<div className="flex items-center gap-1">
<ul className="hidden gap-1 sm:flex">
<li className="w-full">
- <ChangelogViewedButton />
+ <Button variant="link" asChild>
+ <Link
+ href="/changelog"
+ target="_blank"
+ onClick={() => setLastViewed(new Date().toISOString())}
+ className="relative"
+ >
+ Changelog
+ {show ? (
+ <span className="absolute right-1 top-1 h-2 w-2 rounded-full bg-green-500" />
+ ) : null}
+ </Link>
+ </Button>
</li>
<li className="w-full">
<Button variant="link" asChild>
diff --git a/apps/web/src/components/layout/marketing-header.tsx b/apps/web/src/components/layout/marketing-header.tsx
index 3caa87d06..66a2884ce 100644
--- a/apps/web/src/components/layout/marketing-header.tsx
+++ b/apps/web/src/components/layout/marketing-header.tsx
@@ -2,7 +2,6 @@
import Link from "next/link";
import { usePathname } from "next/navigation";
-import { useUser } from "@clerk/nextjs";
import { Button } from "@openstatus/ui";
@@ -17,7 +16,6 @@ interface Props {
}
export function MarketingHeader({ className }: Props) {
- const { isSignedIn } = useUser();
const pathname = usePathname();
return (
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx b/apps/web/src/components/monitor-charts/chart-wrapper.tsx
similarity index 86%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx
rename to apps/web/src/components/monitor-charts/chart-wrapper.tsx
index 71493f6da..eaa0102be 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart-wrapper.tsx
+++ b/apps/web/src/components/monitor-charts/chart-wrapper.tsx
@@ -1,6 +1,6 @@
import type { ResponseGraph } from "@openstatus/tinybird";
-import type { Period, Quantile } from "../../utils";
+import type { Period, Quantile } from "@/lib/monitor/utils";
import { Chart } from "./chart";
import { groupDataByTimestamp } from "./utils";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsx b/apps/web/src/components/monitor-charts/chart.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/chart.tsx
rename to apps/web/src/components/monitor-charts/chart.tsx
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/combined-chart-wrapper.tsx b/apps/web/src/components/monitor-charts/combined-chart-wrapper.tsx
similarity index 90%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/combined-chart-wrapper.tsx
rename to apps/web/src/components/monitor-charts/combined-chart-wrapper.tsx
index 214317808..d37bfffa8 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/combined-chart-wrapper.tsx
+++ b/apps/web/src/components/monitor-charts/combined-chart-wrapper.tsx
@@ -11,12 +11,12 @@ import type {
} from "@openstatus/tinybird";
import { Toggle } from "@openstatus/ui";
+import { IntervalPreset } from "@/components/monitor-dashboard/interval-preset";
+import { QuantilePreset } from "@/components/monitor-dashboard/quantile-preset";
+import { RegionsPreset } from "@/components/monitor-dashboard/region-preset";
+import type { Interval, Period, Quantile } from "@/lib/monitor/utils";
import { usePreferredSettings } from "@/lib/preferred-settings/client";
import type { PreferredSettings } from "@/lib/preferred-settings/server";
-import { IntervalPreset } from "../../_components/interval-preset";
-import { QuantilePreset } from "../../_components/quantile-preset";
-import { RegionsPreset } from "../../_components/region-preset";
-import type { Interval, Period, Quantile } from "../../utils";
import { Chart } from "./chart";
import { RegionTable } from "./region-table";
import { groupDataByTimestamp } from "./utils";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/region-table.tsx b/apps/web/src/components/monitor-charts/region-table.tsx
similarity index 97%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/region-table.tsx
rename to apps/web/src/components/monitor-charts/region-table.tsx
index 88f4e5b4c..b7a4d1e13 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/region-table.tsx
+++ b/apps/web/src/components/monitor-charts/region-table.tsx
@@ -10,7 +10,7 @@ import {
} from "@openstatus/ui";
import { flyRegionsDict } from "@openstatus/utils";
-import { formatNumber } from "../../_components/metrics-card";
+import { formatNumber } from "@/components/monitor-dashboard/metrics-card";
import { SimpleChart } from "./simple-chart";
export interface RegionTableProps {
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart-wrapper.tsx b/apps/web/src/components/monitor-charts/simple-chart-wrapper.tsx
similarity index 90%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart-wrapper.tsx
rename to apps/web/src/components/monitor-charts/simple-chart-wrapper.tsx
index cb9032830..271e5b12f 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart-wrapper.tsx
+++ b/apps/web/src/components/monitor-charts/simple-chart-wrapper.tsx
@@ -1,6 +1,6 @@
import type { Region, ResponseGraph } from "@openstatus/tinybird";
-import type { Period, Quantile } from "../../utils";
+import type { Period, Quantile } from "@/lib/monitor/utils";
import { SimpleChart } from "./simple-chart";
import { groupDataByTimestamp } from "./utils";
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart.tsx b/apps/web/src/components/monitor-charts/simple-chart.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/simple-chart.tsx
rename to apps/web/src/components/monitor-charts/simple-chart.tsx
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/utils.tsx b/apps/web/src/components/monitor-charts/utils.tsx
similarity index 95%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/utils.tsx
rename to apps/web/src/components/monitor-charts/utils.tsx
index cac60b688..f903d6bee 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/_components/utils.tsx
+++ b/apps/web/src/components/monitor-charts/utils.tsx
@@ -3,7 +3,7 @@ import { format } from "date-fns";
import type { Region, ResponseGraph } from "@openstatus/tinybird";
import { regionsDict } from "@openstatus/utils";
-import type { Period, Quantile } from "../../utils";
+import type { Period, Quantile } from "@/lib/monitor/utils";
/**
*
@@ -65,7 +65,6 @@ export function groupDataByTimestamp(
* @returns
*/
export function renderTimestamp(timestamp: number, period: Period) {
- const isInDay = ["1h", "1d"].includes(period);
const date = new Date(timestamp);
return format(date, "MMM d, HH:mm");
}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/button-reset.tsx b/apps/web/src/components/monitor-dashboard/button-reset.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/button-reset.tsx
rename to apps/web/src/components/monitor-dashboard/button-reset.tsx
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx b/apps/web/src/components/monitor-dashboard/date-picker-preset.tsx
similarity index 82%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx
rename to apps/web/src/components/monitor-dashboard/date-picker-preset.tsx
index 7851361e5..d3c3b1f54 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/date-picker-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/date-picker-preset.tsx
@@ -2,8 +2,8 @@
import * as React from "react";
-import { periodFormatter } from "../utils";
-import type { Period } from "../utils";
+import { periodFormatter } from "@/lib/monitor/utils";
+import type { Period } from "@/lib/monitor/utils";
import { SearchParamsPreset } from "./search-params-preset";
export function DatePickerPreset({
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx b/apps/web/src/components/monitor-dashboard/interval-preset.tsx
similarity index 92%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx
rename to apps/web/src/components/monitor-dashboard/interval-preset.tsx
index 81e74b9a0..617a987d9 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/interval-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/interval-preset.tsx
@@ -11,8 +11,8 @@ import {
Separator,
} from "@openstatus/ui";
-import { intervals } from "../utils";
-import type { Interval } from "../utils";
+import { intervals } from "@/lib/monitor/utils";
+import type { Interval } from "@/lib/monitor/utils";
import { SearchParamsPreset } from "./search-params-preset";
export function IntervalPreset({ interval }: { interval: Interval }) {
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics-card.tsx b/apps/web/src/components/monitor-dashboard/metrics-card.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics-card.tsx
rename to apps/web/src/components/monitor-dashboard/metrics-card.tsx
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx b/apps/web/src/components/monitor-dashboard/metrics.tsx
similarity index 97%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx
rename to apps/web/src/components/monitor-dashboard/metrics.tsx
index d52220f43..ef0dfdc2a 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx
+++ b/apps/web/src/components/monitor-dashboard/metrics.tsx
@@ -3,8 +3,8 @@ import { formatDistanceToNowStrict } from "date-fns";
import type { LatencyMetric, ResponseTimeMetrics } from "@openstatus/tinybird";
-import { periodFormatter } from "../utils";
-import type { Period } from "../utils";
+import { periodFormatter } from "@/lib/monitor/utils";
+import type { Period } from "@/lib/monitor/utils";
import { MetricsCard } from "./metrics-card";
const metricsOrder = [
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/pause-button.tsx b/apps/web/src/components/monitor-dashboard/pause-button.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/pause-button.tsx
rename to apps/web/src/components/monitor-dashboard/pause-button.tsx
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx b/apps/web/src/components/monitor-dashboard/quantile-preset.tsx
similarity index 91%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx
rename to apps/web/src/components/monitor-dashboard/quantile-preset.tsx
index d41ca1528..74029f168 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/quantile-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/quantile-preset.tsx
@@ -1,7 +1,6 @@
"use client";
import * as React from "react";
-import { usePathname, useRouter } from "next/navigation";
import { HelpCircle } from "lucide-react";
import {
@@ -12,8 +11,8 @@ import {
Separator,
} from "@openstatus/ui";
-import { quantiles } from "../utils";
-import type { Quantile } from "../utils";
+import { quantiles } from "@/lib/monitor/utils";
+import type { Quantile } from "@/lib/monitor/utils";
import { SearchParamsPreset } from "./search-params-preset";
export function QuantilePreset({
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsx b/apps/web/src/components/monitor-dashboard/region-preset.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/region-preset.tsx
rename to apps/web/src/components/monitor-dashboard/region-preset.tsx
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/response-details.tsx b/apps/web/src/components/monitor-dashboard/response-details.tsx
similarity index 86%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/response-details.tsx
rename to apps/web/src/components/monitor-dashboard/response-details.tsx
index 12a3acd5f..7f874b280 100644
--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/response-details.tsx
+++ b/apps/web/src/components/monitor-dashboard/response-details.tsx
@@ -1,15 +1,17 @@
+// TODO: move to `ping-response-analysis`
+
import { OSTinybird } from "@openstatus/tinybird";
import type { ResponseDetailsParams } from "@openstatus/tinybird";
-import { RegionInfo } from "@/app/play/checker/[id]/_components/region-info";
-import { ResponseHeaderTable } from "@/app/play/checker/[id]/_components/response-header-table";
-import { ResponseTimingTable } from "@/app/play/checker/[id]/_components/response-timing-table";
import {
Tabs,
TabsContent,
TabsList,
TabsTrigger,
} from "@/components/dashboard/tabs";
+import { RegionInfo } from "@/components/ping-response-analysis/region-info";
+import { ResponseHeaderTable } from "@/components/ping-response-analysis/response-header-table";
+import { ResponseTimingTable } from "@/components/ping-response-analysis/response-timing-table";
import { env } from "@/env";
const tb = new OSTinybird({ token: env.TINY_BIRD_API_KEY });
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/search-params-preset.tsx b/apps/web/src/components/monitor-dashboard/search-params-preset.tsx
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/search-params-preset.tsx
rename to apps/web/src/components/monitor-dashboard/search-params-preset.tsx
diff --git a/apps/web/src/app/play/checker/[id]/config.ts b/apps/web/src/components/ping-response-analysis/config.ts
similarity index 100%
rename from apps/web/src/app/play/checker/[id]/config.ts
rename to apps/web/src/components/ping-response-analysis/config.ts
diff --git a/apps/web/src/app/play/checker/[id]/_components/copy-link-button.tsx b/apps/web/src/components/ping-response-analysis/copy-link-button.tsx
similarity index 100%
rename from apps/web/src/app/play/checker/[id]/_components/copy-link-button.tsx
rename to apps/web/src/components/ping-response-analysis/copy-link-button.tsx
diff --git a/apps/web/src/app/play/checker/[id]/_components/copy-to-clipboard-button.tsx b/apps/web/src/components/ping-response-analysis/copy-to-clipboard-button.tsx
similarity index 100%
rename from apps/web/src/app/play/checker/[id]/_components/copy-to-clipboard-button.tsx
rename to apps/web/src/components/ping-response-analysis/copy-to-clipboard-button.tsx
diff --git a/apps/web/src/app/play/checker/[id]/_components/multi-region-chart.tsx b/apps/web/src/components/ping-response-analysis/multi-region-chart.tsx
similarity index 92%
rename from apps/web/src/app/play/checker/[id]/_components/multi-region-chart.tsx
rename to apps/web/src/components/ping-response-analysis/multi-region-chart.tsx
index 304805f66..0683052ce 100644
--- a/apps/web/src/app/play/checker/[id]/_components/multi-region-chart.tsx
+++ b/apps/web/src/components/ping-response-analysis/multi-region-chart.tsx
@@ -2,8 +2,8 @@
import { BarChart } from "@tremor/react";
-import type { RegionChecker } from "../utils";
-import { getTimingPhases, latencyFormatter, regionFormatter } from "../utils";
+import type { RegionChecker } from "./utils";
+import { getTimingPhases, latencyFormatter, regionFormatter } from "./utils";
export function MultiRegionChart({ regions }: { regions: RegionChecker[] }) {
const data = regions.map((item) => {
diff --git a/apps/web/src/app/play/checker/[id]/_components/multi-region-table.tsx b/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
similarity index 96%
rename from apps/web/src/app/play/checker/[id]/_components/multi-region-table.tsx
rename to apps/web/src/components/ping-response-analysis/multi-region-table.tsx
index 509a3a725..4d1404444 100644
--- a/apps/web/src/app/play/checker/[id]/_components/multi-region-table.tsx
+++ b/apps/web/src/components/ping-response-analysis/multi-region-table.tsx
@@ -9,13 +9,13 @@ import {
} from "@openstatus/ui";
import { StatusCodeBadge } from "@/components/monitor/status-code-badge";
-import type { RegionChecker } from "../utils";
import {
getTimingPhases,
getTotalLatency,
latencyFormatter,
regionFormatter,
-} from "../utils";
+} from "./utils";
+import type { RegionChecker } from "./utils";
// TBD: add the popover infos about timing details
diff --git a/apps/web/src/app/play/checker/[id]/_components/multi-region-tabs.tsx b/apps/web/src/components/ping-response-analysis/multi-region-tabs.tsx
similarity index 93%
rename from apps/web/src/app/play/checker/[id]/_components/multi-region-tabs.tsx
rename to apps/web/src/components/ping-response-analysis/multi-region-tabs.tsx
index 6c4363501..2524368ec 100644
--- a/apps/web/src/app/play/checker/[id]/_components/multi-region-tabs.tsx
+++ b/apps/web/src/components/ping-response-analysis/multi-region-tabs.tsx
@@ -1,8 +1,8 @@
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@openstatus/ui";
-import type { RegionChecker } from "../utils";
import { MultiRegionChart } from "./multi-region-chart";
import { MultiRegionTable } from "./multi-region-table";
+import type { RegionChecker } from "./utils";
export function MultiRegionTabs({ regions }: { regions: RegionChecker[] }) {
return (
diff --git a/apps/web/src/app/play/checker/[id]/_components/region-info.tsx b/apps/web/src/components/ping-response-analysis/region-info.tsx
similarity index 92%
rename from apps/web/src/app/play/checker/[id]/_components/region-info.tsx
rename to apps/web/src/components/ping-response-analysis/region-info.tsx
index f97abf34e..2e4a05917 100644
--- a/apps/web/src/app/play/checker/[id]/_components/region-info.tsx
+++ b/apps/web/src/components/ping-response-analysis/region-info.tsx
@@ -1,10 +1,6 @@
import { StatusCodeBadge } from "@/components/monitor/status-code-badge";
-import {
- latencyFormatter,
- regionFormatter,
- timestampFormatter,
-} from "../utils";
-import type { RegionChecker } from "../utils";
+import { latencyFormatter, regionFormatter, timestampFormatter } from "./utils";
+import type { RegionChecker } from "./utils";
export function RegionInfo({
check,
diff --git a/apps/web/src/app/play/checker/[id]/_components/response-assertion.tsx b/apps/web/src/components/ping-response-analysis/response-assertion.tsx
similarity index 100%
rename from apps/web/src/app/play/checker/[id]/_components/response-assertion.tsx
rename to apps/web/src/components/ping-response-analysis/response-assertion.tsx
diff --git a/apps/web/src/app/play/checker/[id]/_components/response-detail-tabs.tsx b/apps/web/src/components/ping-response-analysis/response-detail-tabs.tsx
similarity index 97%
rename from apps/web/src/app/play/checker/[id]/_components/response-detail-tabs.tsx
rename to apps/web/src/components/ping-response-analysis/response-detail-tabs.tsx
index 61e847c47..a4d8b3816 100644
--- a/apps/web/src/app/play/checker/[id]/_components/response-detail-tabs.tsx
+++ b/apps/web/src/components/ping-response-analysis/response-detail-tabs.tsx
@@ -6,10 +6,10 @@ import {
TabsList,
TabsTrigger,
} from "@/components/dashboard/tabs";
-import type { Timing } from "../utils";
import { ResponseAssertion } from "./response-assertion";
import { ResponseHeaderTable } from "./response-header-table";
import { ResponseTimingTable } from "./response-timing-table";
+import type { Timing } from "./utils";
export async function ResponseDetailTabs({
timing,
diff --git a/apps/web/src/app/play/checker/[id]/_components/response-header-table.tsx b/apps/web/src/components/ping-response-analysis/response-header-table.tsx
similarity index 100%
rename from apps/web/src/app/play/checker/[id]/_components/response-header-table.tsx
rename to apps/web/src/components/ping-response-analysis/response-header-table.tsx
diff --git a/apps/web/src/app/play/checker/[id]/_components/response-timing-table.tsx b/apps/web/src/components/ping-response-analysis/response-timing-table.tsx
similarity index 94%
rename from apps/web/src/app/play/checker/[id]/_components/response-timing-table.tsx
rename to apps/web/src/components/ping-response-analysis/response-timing-table.tsx
index d0b8ee071..13ebee315 100644
--- a/apps/web/src/app/play/checker/[id]/_components/response-timing-table.tsx
+++ b/apps/web/src/components/ping-response-analysis/response-timing-table.tsx
@@ -13,9 +13,9 @@ import {
TableRow,
} from "@openstatus/ui";
-import { timingDict } from "../config";
-import type { Timing } from "../utils";
-import { getTimingPhases, getTotalLatency } from "../utils";
+import { timingDict } from "./config";
+import type { Timing } from "./utils";
+import { getTimingPhases, getTotalLatency } from "./utils";
export function ResponseTimingTable({
timing,
diff --git a/apps/web/src/app/play/checker/[id]/_components/select-region.tsx b/apps/web/src/components/ping-response-analysis/select-region.tsx
similarity index 97%
rename from apps/web/src/app/play/checker/[id]/_components/select-region.tsx
rename to apps/web/src/components/ping-response-analysis/select-region.tsx
index 777640ddb..48f996bf5 100644
--- a/apps/web/src/app/play/checker/[id]/_components/select-region.tsx
+++ b/apps/web/src/components/ping-response-analysis/select-region.tsx
@@ -14,7 +14,7 @@ import {
} from "@openstatus/ui";
import useUpdateSearchParams from "@/hooks/use-update-search-params";
-import { regionFormatter } from "../utils";
+import { regionFormatter } from "./utils";
export function SelectRegion({
defaultValue,
diff --git a/apps/web/src/app/play/checker/[id]/utils.ts b/apps/web/src/components/ping-response-analysis/utils.ts
similarity index 100%
rename from apps/web/src/app/play/checker/[id]/utils.ts
rename to apps/web/src/components/ping-response-analysis/utils.ts
diff --git a/apps/web/src/components/workspace/changelog-viewed-button.tsx b/apps/web/src/components/workspace/changelog-viewed-button.tsx
deleted file mode 100644
index f2d3227a1..000000000
--- a/apps/web/src/components/workspace/changelog-viewed-button.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { useEffect, useState } from "react";
-import Link from "next/link";
-import { allChangelogs } from "contentlayer/generated";
-
-import { Button } from "@openstatus/ui";
-
-const lastChangelog = allChangelogs
- .sort(
- (a, b) =>
- new Date(a.publishedAt).getTime() - new Date(b.publishedAt).getTime(),
- )
- .pop();
-
-export function ChangelogViewedButton() {
- const [show, setShow] = useState(false);
-
- function onClick() {
- if (document) {
- const date = new Date().toISOString();
- // store the last viewed changelog date in a cookie
- document.cookie = `last-viewed-changelog=${date}; path=/`;
- }
- setShow(false);
- }
-
- useEffect(() => {
- if (document) {
- const cookie = document.cookie
- .split("; ")
- .find((row) => row.startsWith("last-viewed-changelog"));
- if (!cookie) {
- setShow(true);
- return;
- }
- const lastViewed = new Date(cookie.split("=")[1]);
- if (lastChangelog && lastViewed < new Date(lastChangelog.publishedAt)) {
- setShow(true);
- }
- }
- }, []);
-
- return (
- <Button variant="link" asChild>
- <Link
- href="/changelog"
- target="_blank"
- onClick={onClick}
- className="relative"
- >
- Changelog
- {show ? (
- <span className="absolute right-1 top-1 h-2 w-2 rounded-full bg-green-500" />
- ) : null}
- </Link>
- </Button>
- );
-}
diff --git a/apps/web/src/hooks/use-cookie-state.ts b/apps/web/src/hooks/use-cookie-state.ts
new file mode 100644
index 000000000..648de1c62
--- /dev/null
+++ b/apps/web/src/hooks/use-cookie-state.ts
@@ -0,0 +1,32 @@
+"use client";
+
+import { useCallback, useEffect, useState } from "react";
+
+export function useCookieState(name: string, defaultValue?: string) {
+ const [state, setState] = useState<string>();
+
+ const handleChange = useCallback(
+ (value: string) => {
+ if (document) {
+ document.cookie = `${name}=${value}; path=/`;
+ setState(value);
+ }
+ },
+ [name],
+ );
+
+ useEffect(() => {
+ if (document) {
+ const cookie = document.cookie
+ .split("; ")
+ .find((row) => row.startsWith(name));
+ if (!cookie) {
+ setState(defaultValue);
+ return;
+ }
+ setState(cookie.split("=")[1]);
+ }
+ }, []);
+
+ return [state, handleChange] as const;
+}
diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts b/apps/web/src/lib/monitor/utils.ts
similarity index 100%
rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/utils.ts
rename to apps/web/src/lib/monitor/utils.ts