From 438383cdc4fed082a3fe2ea3bf69f3f94c7ed863 Mon Sep 17 00:00:00 2001 From: Thibault Le Ouay Date: Sat, 27 Apr 2024 17:48:34 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20rum=20(#788)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rum/(overview)/_components/MetricCard.tsx | 3 +- packages/api/src/router/clerk/webhook.ts | 6 +--- packages/api/src/router/rum/index.ts | 30 ++++++++++--------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx index a9a70a3f..d7a6a67f 100644 --- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx +++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/rum/(overview)/_components/MetricCard.tsx @@ -10,14 +10,13 @@ export const RUMMetricCard = async ({ const data = await api.rumRouter.GetEventMetricsForWorkspace.query({ event: event, }); - console.log(data); return (

{event}

- {data.median} + {data?.median || 0}

); diff --git a/packages/api/src/router/clerk/webhook.ts b/packages/api/src/router/clerk/webhook.ts index b09c6e81..d3105156 100644 --- a/packages/api/src/router/clerk/webhook.ts +++ b/packages/api/src/router/clerk/webhook.ts @@ -1,5 +1,3 @@ -import { customAlphabet } from "nanoid"; -import { alphanumeric } from "nanoid-dictionary"; import * as randomWordSlugs from "random-word-slugs"; import * as z from "zod"; @@ -53,12 +51,10 @@ export const webhookRouter = createTRPCRouter({ slug = undefined; } } - const lowercaseRandomString = customAlphabet(alphanumeric, 10); - const dsn = `os_rum_${lowercaseRandomString}`; const workspaceResult = await opts.ctx.db .insert(workspace) - .values({ slug, name: "", dsn }) + .values({ slug, name: "" }) .returning({ id: workspace.id }) .get(); await opts.ctx.db diff --git a/packages/api/src/router/rum/index.ts b/packages/api/src/router/rum/index.ts index a9a6e912..aa47cf16 100644 --- a/packages/api/src/router/rum/index.ts +++ b/packages/api/src/router/rum/index.ts @@ -14,27 +14,29 @@ export const rumRouter = createTRPCRouter({ .query(async (opts) => { try { const data = await opts.ctx.clickhouseClient.query({ - query: `select - event_name, - quantile(0.5)(value) as median - from - cwv - where - dsn = '${opts.ctx.workspace.dsn}' - and event_name = '${opts.input.event}' - group by - event_name -`, + query: ` + select + event_name, + quantile(0.5)(value) as median + from cwv + where + dsn = '${opts.ctx.workspace.dsn}' + and event_name = '${opts.input.event}' + group by event_name + `, format: "JSONEachRow", }); const result = await data.json(); const schema = z.array( z.object({ event_name: z.string(), median: z.number() }), ); - return schema.parse(result)[0]; + if (!result) { + return null; + } + const d = schema.parse(result); + return d.length > 0 ? d[0] : null; } catch (e) { - console.error(e); - throw e; + return null; } }), }); -- 2.51.2