Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
fix: private locations (#1460)
Maximilian Kaskeae29e8b349b6
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsxindex 1d7e4e48c..bbec02260 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/client.tsx@@ -43,9 +43,6 @@ export function Client() {setSearchParams,] = useQueryStates(searchParamsParsers);const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());- const { data: privateLocations } = useQuery(- trpc.privateLocation.list.queryOptions(),- );const { data: monitor } = useQuery(trpc.monitor.get.queryOptions({ id: Number.parseInt(id) }),);@@ -79,8 +76,8 @@ export function Client() {);const columns = useMemo(- () => getColumns(privateLocations ?? []),- [privateLocations],+ () => getColumns(monitor?.privateLocations ?? []),+ [monitor?.privateLocations],);if (!workspace || !monitor) return null;@@ -106,9 +103,7 @@ export function Client() {<DropdownTrigger /><CommandRegionregions={monitor.regions}- privateLocations={privateLocations?.filter((location) =>- location.monitors.some((m) => m.id === Number(id)),- )}+ privateLocations={monitor?.privateLocations}/><ButtonReset /></div>@@ -145,7 +140,7 @@ export function Client() {)}<Sheetdata={_log?.data?.length ? _log.data[0] : null}- privateLocations={privateLocations}+ privateLocations={monitor?.privateLocations ?? []}onClose={() =>setTimeout(() => setSearchParams({ selected: null }), 300)}diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx b/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsxindex 87a0140cb..0f5c370f2 100644--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/client.tsx@@ -22,6 +22,7 @@ import { GlobalUptimeSection } from "@/components/metric/global-uptime/section";import { PopoverQuantile } from "@/components/popovers/popover-quantile";import { PopoverResolution } from "@/components/popovers/popover-resolution";import { DataTable } from "@/components/ui/data-table/data-table";+import { DataTablePagination } from "@/components/ui/data-table/data-table-pagination";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";import { mapRegionMetrics } from "@/data/metrics.client";import type { RegionMetric } from "@/data/region-metrics";@@ -43,10 +44,6 @@ export function Client() {const { data: monitor } = useQuery(trpc.monitor.get.queryOptions({ id: Number.parseInt(id) }),);- const { data: privateLocations } = useQuery(- trpc.privateLocation.list.queryOptions(),- );-const selectedRegions = regions ?? undefined;const regionTimelineQuery = {@@ -72,16 +69,17 @@ export function Client() {? monitor?.regions ?? []: [...monitorRegions,- ...(privateLocations?.map((location) => location.id.toString()) ??- []),+ ...(monitor?.privateLocations?.map((location) =>+ location.id.toString(),+ ) ?? []),],percentile,);- }, [regionTimeline, monitor, percentile, isLoading, privateLocations]);+ }, [regionTimeline, monitor, percentile, isLoading]);const regionColumns = useMemo(- () => getRegionColumns(privateLocations ?? []),- [privateLocations],+ () => getRegionColumns(monitor?.privateLocations ?? []),+ [monitor?.privateLocations],);if (!monitor) return null;@@ -106,7 +104,7 @@ export function Client() {<DropdownPeriod /> including{" "}<CommandRegionregions={monitor.regions}- privateLocations={privateLocations}+ privateLocations={monitor.privateLocations}/></div><div>@@ -200,17 +198,16 @@ export function Client() {<DataTabledata={regionMetrics}columns={regionColumns}- defaultPagination={{- pageIndex: 0,- pageSize: regionMetrics.length,- }}+ paginationComponent={({ table }) => (+ <DataTablePagination table={table} />+ )}/></TabsContent><TabsContent value="chart"><ChartLineRegionsclassName="mt-3"regions={regionMetrics.map((region) => region.region)}- privateLocations={privateLocations}+ privateLocations={monitor?.privateLocations ?? []}data={regionMetrics.reduce((acc, region) => {region.trend.forEach((t) => {diff --git a/apps/dashboard/src/app/(dashboard)/private-locations/nav-actions.tsx b/apps/dashboard/src/app/(dashboard)/private-locations/nav-actions.tsxindex f97dcd7ef..08d28e723 100644--- a/apps/dashboard/src/app/(dashboard)/private-locations/nav-actions.tsx+++ b/apps/dashboard/src/app/(dashboard)/private-locations/nav-actions.tsx@@ -47,6 +47,7 @@ export function NavActions() {await createPrivateLocationMutation.mutateAsync({name: values.name,monitors: values.monitors,+ token: values.token,});}}>diff --git a/apps/dashboard/src/components/data-table/private-locations/data-table-row-actions.tsx b/apps/dashboard/src/components/data-table/private-locations/data-table-row-actions.tsxindex e5282afdb..9027419bd 100644--- a/apps/dashboard/src/components/data-table/private-locations/data-table-row-actions.tsx+++ b/apps/dashboard/src/components/data-table/private-locations/data-table-row-actions.tsx@@ -59,7 +59,7 @@ export function DataTableRowActions(props: DataTableRowActionsProps) {<FormSheetPrivateLocationdefaultValues={{name: props.row.original.name,- key: props.row.original.token.toString(),+ token: props.row.original.token.toString(),monitors: props.row.original.monitors.map((m) => m.id),}}monitors={monitors ?? []}diff --git a/apps/dashboard/src/components/forms/private-location/form.tsx b/apps/dashboard/src/components/forms/private-location/form.tsxindex 91837f402..1d5dea55a 100644--- a/apps/dashboard/src/components/forms/private-location/form.tsx+++ b/apps/dashboard/src/components/forms/private-location/form.tsx@@ -39,7 +39,7 @@ import { z } from "zod";const schema = z.object({name: z.string().min(1, "Name is required"),- key: z.string(),+ token: z.string(),monitors: z.array(z.number()),});@@ -60,7 +60,7 @@ export function FormPrivateLocation({resolver: zodResolver(schema),defaultValues: defaultValues ?? {name: "",- key: crypto.randomUUID(),+ token: crypto.randomUUID(),monitors: [],},});@@ -116,15 +116,15 @@ export function FormPrivateLocation({<FormCardContent><FormFieldcontrol={form.control}- name="key"+ name="token"disabledrender={({ field }) => (<FormItem>- <FormLabel>Key</FormLabel>+ <FormLabel>Token</FormLabel><FormControl><InputGroup><InputGroupInput- placeholder="Private Location Key"+ placeholder="Private Location Token"readOnlyvalue={field.value}/>@@ -135,7 +135,7 @@ export function FormPrivateLocation({size="icon-xs"onClick={() => {copy(field.value, {- successMessage: "Key copied to clipboard",+ successMessage: "Token copied to clipboard",});}}>diff --git a/packages/api/src/router/privateLocation.ts b/packages/api/src/router/privateLocation.tsindex 42c078323..f7eaa42a0 100644--- a/packages/api/src/router/privateLocation.ts+++ b/packages/api/src/router/privateLocation.ts@@ -32,17 +32,16 @@ export const privateLocationRouter = createTRPCRouter({z.object({name: z.string(),monitors: z.array(z.number()),+ token: z.string(),}),).mutation(async (opts) => {- const token = crypto.randomUUID();-return await opts.ctx.db.transaction(async (tx) => {const _privateLocation = await tx.insert(privateLocation).values({name: opts.input.name,- token,+ token: opts.input.token,workspaceId: opts.ctx.workspace.id,}).returning()