perf: use repository for webhooks list query & caching in /settings/developer/webhooks/... RSC by Amit91848 · Pull Request #21781 · calcom/cal.com

Amit91848 · 2025-06-12T06:48:34Z

What does this PR do?

Caches

settings/developer/webhooks
settings/developer/webhooks/{id}
settings/developer/webhooks/new

Video Demo (if applicable):

BEFORE

Screencast.from.2025-06-13.02-40-55.webm

AFTER

Screencast.from.2025-06-13.02-44-45.webm

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

Summary by cubic

Improved performance of the webhooks settings pages by switching to repository-based queries and adding caching for webhook lists and details.

Performance
- Replaced direct TRPC queries with repository methods for listing and fetching webhooks.
- Added server-side caching with revalidation for webhook data in settings pages.

…eveloper/webhooks/... RSC

vercel · 2025-06-12T06:48:35Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Jun 22, 2025 7:52pm
cal-eu	⬜️ Ignored (Inspect)	Visit Preview		Jun 22, 2025 7:52pm

…che-settings-developers-webhooks

graphite-app · 2025-06-12T21:20:12Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (06/12/25)

1 reviewer was added to this PR based on Keith Williams's automation.

cubic-dev-ai

cubic found 3 issues across 11 files. Review them in cubic.dev

_{React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.}

cubic-dev-ai · 2025-06-12T21:23:11Z

packages/lib/server/repository/webhook.ts

+    });
+
+    if (Array.isArray(where.AND)) {
+      if (input?.eventTypeId) {


When eventTypeId is provided, the query omits any filter based on userId or team membership, allowing the caller to fetch webhooks that belong to other users or teams. This breaks access control and can expose private data.

cubic-dev-ai · 2025-06-12T21:23:11Z

packages/lib/server/repository/webhook.ts

+        }
+      } else {
+        where.AND?.push({
+          OR: [{ userId }, { teamId: { in: user?.teams.map((membership) => membership.teamId) } }],


user?.teams may be undefined when the user is not found, causing .map to be called on undefined and throw at runtime. Use optional chaining or a fallback empty array before mapping.

Suggested change

OR: [{ userId }, { teamId: { in: user?.teams.map((membership) => membership.teamId) } }],

OR: [{ userId }, { teamId: { in: (user?.teams?.map((membership) => membership.teamId) ?? []) } }],

cubic-dev-ai · 2025-06-12T21:23:11Z

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx

  );

+const getCachedWebhook = (id?: string) => {
+  const fn = unstable_cache(


unstable_cache is instantiated inside getCachedWebhook on every call, so caching cannot persist between calls because a new cache instance is created each time and no explicit cache key is provided; this largely defeats the purpose of caching and wastes memory.

github-actions · 2025-06-12T21:47:28Z

E2E results are ready!

Workflow #64142.1 latest results

hbjORbj

Great job! Left 2 comments!

hbjORbj · 2025-06-13T18:44:38Z

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx

+const getCachedWebhook = (id?: string) => {
+  const fn = unstable_cache(


unnecessary nesting

Wouldn't we want to only revalidate cache of only a particular webhook? We cannot pass id directly to tags when using unstable_cache, so we need to wrap it

hbjORbj · 2025-06-13T18:46:07Z

packages/trpc/server/routers/viewer/webhook/list.handler.ts

-  return await prisma.webhook.findMany({
-    where,
-  });
+  return WebhookRepository.findWebhooksByFilters({ userId: ctx.user.id, input });


…che-settings-developers-webhooks

…hub.com/calcom/cal.com into perf/cache-settings-developers-webhooks

cubic-dev-ai

cubic found 1 issue across 11 files. Review it in cubic.dev

_{React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.}

cubic-dev-ai · 2025-06-16T18:45:05Z

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx

+    async () => {
+      return await WebhookRepository.findByWebhookId(id);
+    },
+    undefined,


Passing undefined as the keyParts argument means a new cached function (and therefore a new cache entry) is created every time getCachedWebhook is called, which largely negates the purpose of unstable_cache. Provide a stable key (e.g. the webhook id) or hoist the cached function outside the wrapper so that the same cache entry is reused.

Suggested change

undefined,

[`webhook:${id}`],

cubic-dev-ai

cubic found 3 issues across 11 files. Review them in cubic.dev

_{React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.}

cubic-dev-ai · 2025-06-16T18:50:07Z

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/developer/webhooks/[id]/page.tsx

+    async () => {
+      return await WebhookRepository.findByWebhookId(id);
+    },
+    undefined,


Passing undefined as the keyParts argument means a new cached function (and therefore a new cache entry) is created every time getCachedWebhook is called, which largely negates the purpose of unstable_cache. Provide a stable key (e.g. the webhook id) or hoist the cached function outside the wrapper so that the same cache entry is reused.

Suggested change

undefined,

[`webhook:${id}`],

cubic-dev-ai · 2025-06-16T18:50:07Z

packages/lib/server/repository/webhook.ts

+        }
+      } else {
+        where.AND?.push({
+          OR: [{ userId }, { teamId: { in: user?.teams.map((membership) => membership.teamId) } }],


user can be null when the lookup fails, causing in: undefined and a Prisma runtime error. Provide a fallback array or ensure the user exists before constructing the filter.

Suggested change

OR: [{ userId }, { teamId: { in: user?.teams.map((membership) => membership.teamId) } }],

OR: [{ userId }, { teamId: { in: (user?.teams ?? []).map((membership) => membership.teamId) } }],

cubic-dev-ai · 2025-06-16T18:50:08Z

packages/lib/server/repository/webhook.ts

+        id: userId,
+      },
+      select: {
+        teams: true,


Selecting the entire teams relation fetches all membership fields and nested team data even though only teamId is subsequently used. This increases query payload size and may expose unnecessary data.

Suggested change

teams: true,

teams: { select: { teamId: true } },

packages/lib/server/repository/webhook.ts

github-actions · 2025-07-07T00:28:02Z

This PR is being marked as stale due to inactivity.

emrysal

Fundamentally looks like an improvement but it should be updated to use the latest patterns - instantiation for di.

LGTM :)

…ttings/developer/webhooks/... RSC (#21781)" This reverts commit 0829929.

…ttings/developer/webhooks/... RSC (#21781)" (#22963)

…ttings/developer/webhooks/... RSC (calcom#21781)" (calcom#22963)

perf: use repository for webhooks list query & caching in /settings/d…

649c0e8

…eveloper/webhooks/... RSC

Amit91848 requested a review from hbjORbj June 12, 2025 06:48

keithwillcode added the core area: core, team members only label Jun 12, 2025

vercel bot deployed to Preview – dev June 12, 2025 07:15 View deployment

Amit91848 added 3 commits June 12, 2025 20:02

Merge branch 'main' of https://github.com/calcom/cal.com into perf/ca…

b0dc180

…che-settings-developers-webhooks

fix type check

78137c7

invalidate cache on webhook list item actions

51c4384

Amit91848 marked this pull request as ready for review June 12, 2025 21:16

graphite-app bot requested a review from a team June 12, 2025 21:16

dosubot bot added performance area: performance, page load, slow, slow endpoints, loading screen, unresponsive webhooks area: webhooks, callback, webhook payload labels Jun 12, 2025

Amit91848 added the ready-for-e2e label Jun 12, 2025

cubic-dev-ai bot reviewed Jun 12, 2025

View reviewed changes

vercel bot deployed to Preview – dev June 12, 2025 21:41 View deployment

hbjORbj previously requested changes Jun 13, 2025

View reviewed changes

github-actions bot marked this pull request as draft June 13, 2025 18:47

fix review comment

473a48c

Amit91848 marked this pull request as ready for review June 16, 2025 18:30

Amit91848 and others added 2 commits June 17, 2025 00:00

Merge branch 'main' into perf/cache-settings-developers-webhooks

010a49a

Merge branch 'main' of https://github.com/calcom/cal.com into perf/ca…

6443423

…che-settings-developers-webhooks

dosubot bot added the 🧹 Improvements Improvements to existing features. Mostly UX/UI label Jun 16, 2025

Merge branch 'perf/cache-settings-developers-webhooks' of https://git…

de62213

…hub.com/calcom/cal.com into perf/cache-settings-developers-webhooks

Amit91848 requested a review from hbjORbj June 16, 2025 18:33

cubic-dev-ai bot reviewed Jun 16, 2025

View reviewed changes

vercel bot deployed to Preview – dev June 16, 2025 19:05 View deployment

Merge branch 'main' into perf/cache-settings-developers-webhooks

245a1f7

Amit91848 commented Jun 22, 2025

View reviewed changes

packages/lib/server/repository/webhook.ts Outdated Show resolved Hide resolved

fix merge conflicts

8a820fc

vercel bot deployed to Preview – dev June 22, 2025 20:44 View deployment

github-actions bot added the Stale label Jul 7, 2025

emrysal approved these changes Aug 5, 2025

View reviewed changes

emrysal enabled auto-merge (squash) August 5, 2025 00:25

emrysal merged commit 0829929 into main Aug 5, 2025
41 checks passed

emrysal deleted the perf/cache-settings-developers-webhooks branch August 5, 2025 00:25

joeauyeung added a commit that referenced this pull request Aug 7, 2025

Revert "perf: use repository for webhooks list query & caching in /se…

061f644

…ttings/developer/webhooks/... RSC (#21781)" This reverts commit 0829929.

joeauyeung mentioned this pull request Aug 7, 2025

Revert "perf: use repository for webhooks list query & caching in /se… #22963

Merged

3 tasks

zomars pushed a commit that referenced this pull request Aug 7, 2025

Revert "perf: use repository for webhooks list query & caching in /se…

cfefba6

…ttings/developer/webhooks/... RSC (#21781)" (#22963)

zomars pushed a commit that referenced this pull request Aug 7, 2025

Revert "perf: use repository for webhooks list query & caching in /se…

7c613b1

…ttings/developer/webhooks/... RSC (#21781)" (#22963)

pallava-joshi pushed a commit to pallava-joshi/cal.com that referenced this pull request Aug 8, 2025

Revert "perf: use repository for webhooks list query & caching in /se…

4744ea5

…ttings/developer/webhooks/... RSC (calcom#21781)" (calcom#22963)

	OR: [{ userId }, { teamId: { in: user?.teams.map((membership) => membership.teamId) } }],
	OR: [{ userId }, { teamId: { in: (user?.teams?.map((membership) => membership.teamId) ?? []) } }],

		const getCachedWebhook = (id?: string) => {
		const fn = unstable_cache(

Comments

Conversation

Amit91848 commented Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Video Demo (if applicable):

Mandatory Tasks (DO NOT REMOVE)

Summary by cubic

Uh oh!

vercel bot commented Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

graphite-app bot commented Jun 12, 2025

Graphite Automations

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

hbjORbj left a comment

Choose a reason for hiding this comment

Uh oh!

hbjORbj Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

Amit91848 Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

hbjORbj Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

Amit91848 Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jun 16, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jul 7, 2025

Uh oh!

emrysal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Amit91848 commented Jun 12, 2025 •

edited

Loading

vercel bot commented Jun 12, 2025 •

edited

Loading

github-actions bot commented Jun 12, 2025 •

edited

Loading