feat: OOO webhook and zapier #15434

alannnc · 2024-06-14T07:13:00Z

What does this PR do?

Fixes [CAL-3933] OOO: webhook and zapier #15430
Fixes CAL-3933

Loom Video: https://www.loom.com/share/b1a4d42ec78944d49248501e2d805c56

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected)
I have added a Docs issue here if this PR makes changes that would require a documentation change
I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)

How should this be tested?

Are there environment variables that should be set? set environment time to UTC
What are the minimal test data to have? Zapier developer account & app
What is expected (happy path) to have (input and output)? Create a ooo entry and expect webhooks/zapier triggers
Any other important info that could help to test that PR For testing webhooks https://webhook.site/

Checklist

/claim #15430

vercel · 2024-06-14T07:13:06Z

@alannnc is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

algora-pbc · 2024-06-14T07:13:09Z

💵 To receive payouts, sign up on Algora, link your Github account and connect with Stripe/Alipay.

github-actions · 2024-06-14T07:13:12Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

Unknown release type "OOO" found in pull request title "OOO: webhook and zapier". 

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

graphite-app · 2024-06-14T07:15:10Z

Graphite Automations

"Add community label" took an action on this PR • (06/14/24)

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

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

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

alannnc · 2024-06-14T07:15:10Z

apps/web/pages/settings/my-account/out-of-office/index.tsx

@@ -367,7 +367,7 @@ const OutOfOfficePage = () => {
  const { t } = useLocale();

  const params = useSearchParams();
-  const openModalOnStart = !!params?.get("om");
+  const openModalOnStart = !!params?.get("open");


Better name

alannnc · 2024-06-14T07:15:29Z

packages/app-store/zapier/README.md

 ### Set ZAPIER_INVITE_LINK

-The invite link can be found under under Manage → Sharing.
+The invite link can be found under Manage → Sharing.


double under

alannnc · 2024-06-14T07:15:38Z

packages/app-store/zapier/README.md

@@ -67,5 +87,5 @@ Localhost urls can not be used as the base URL for api endpoints
 Possible solution: using [https://ngrok.com/](https://ngrok.com/)

 1. Create Account
-2. [Download](https://ngrok.com/download) gnork and start a tunnel to your running localhost
+2. [Download](https://ngrok.com/download) ngrok and start a tunnel to your running localhost


alannnc · 2024-06-14T07:16:07Z

packages/app-store/zapier/components/AppSettingsInterface.tsx

+    icon: "googleCalendar.svg",
+    app: "Google Calendar",
+    text: "Add new calendar event when a team member is out of office",
+    link: "https://zapier.com/app/editor/template/ToBeDefined",


Once you got created this template in your app update ID here

lets follow up with this in a different PR so we can merge this one

alannnc · 2024-06-14T07:16:19Z

packages/features/webhooks/components/WebhookForm.tsx

@@ -92,7 +93,6 @@ const WebhookForm = (props: {
  const [newSecret, setNewSecret] = useState("");
  const [changeSecret, setChangeSecret] = useState<boolean>(false);
  const hasSecretKey = !!props?.webhook?.secret;
-  // const currentSecret = props?.webhook?.secret;


alannnc · 2024-06-14T07:17:23Z

packages/features/webhooks/components/WebhookForm.tsx

@@ -282,7 +282,7 @@ const WebhookForm = (props: {
        <Button
          type="submit"
          disabled={!formMethods.formState.isDirty && !changeSecret}
-          loading={formMethods.formState.isSubmitting || formMethods.formState.isSubmitted}>
+          loading={formMethods.formState.isSubmitting}>


isSubmitted is bad here because after you submit and error happened you still will be seeing the loading.

alannnc · 2024-06-14T07:17:50Z

packages/features/webhooks/lib/scheduleTrigger.ts

@@ -451,3 +451,89 @@ export async function updateTriggerForExistingBookings(
  );
  await Promise.all(promise);
 }
+
+export async function listOOOEntries(


Functions that helps zapier fetch and look data fields as example for Zap.

alannnc · 2024-06-14T07:18:42Z

packages/features/webhooks/lib/sendPayload.ts

-  EventTypeInfo & {
-    metadata?: { [key: string]: string | number | boolean | null };
+export type WebhookDataType = Partial<CalendarEvent> &
+  Partial<EventTypeInfo> & {


Partial as open a new path for webhooks that can include different set of data and not just bookings

alannnc · 2024-06-14T07:19:49Z

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

@@ -17,33 +18,29 @@ type CreateOptions = {
 };

 export const createHandler = async ({ ctx, input }: CreateOptions) => {
+  const { user } = ctx;


Cleaning since original file had a lot of redundancy

alannnc · 2024-06-14T07:20:18Z

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

    });
+  } catch (error) {
+    // Avoid printing raw prisma error on frontend


No more prisma raw error on website

…ooo-zapier-webhook

alannnc added 7 commits February 9, 2024 15:12

Merge branch 'main' of github.com:calcom/cal.com

7779c2c

Merge branch 'main' of github.com:calcom/cal.com

b733467

Merge branch 'main' of github.com:calcom/cal.com

7ecde3e

Merge branch 'main' of github.com:calcom/cal.com

64e8d62

Merge branch 'main' of github.com:calcom/cal.com

13c97c6

zapier and webhook

db3cd80

instructions for zapier

7ee830d

graphite-app bot added the community Created by Linear-GitHub Sync label Jun 14, 2024

graphite-app bot requested a review from a team June 14, 2024 07:13

algora-pbc bot mentioned this pull request Jun 14, 2024

[CAL-3933] OOO: webhook and zapier #15430

Open

algora-pbc bot added the 🙋 Bounty claim label Jun 14, 2024

github-actions bot added the ❗️ migrations contains migration files label Jun 14, 2024

dosubot bot added app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar webhooks area: webhooks, callback, webhook payload ✨ feature New feature or request labels Jun 14, 2024

alannnc changed the title ~~OOO: webhook and zapier~~ feat: OOO: webhook and zapier Jun 14, 2024

Merge branch 'main' into ooo-zapier-webhook

5b08a79

alannnc commented Jun 14, 2024

View reviewed changes

alannnc added 3 commits June 14, 2024 00:36

Fix types

cb27139

Merge branch 'ooo-zapier-webhook' of github.com:alannnc/cal.com into …

23b840b

…ooo-zapier-webhook

fix types

9dfdf9a

github-actions bot added the 💎 Bounty A bounty on Algora.io label Jun 14, 2024

dosubot bot added this to the v4.2 milestone Jun 14, 2024

PeerRich requested a review from CarinaWolli June 14, 2024 15:55

Udit-takkar changed the title ~~feat: OOO: webhook and zapier~~ feat: OOO webhook and zapier Jun 14, 2024

alannnc added 2 commits June 14, 2024 10:26

revert adding zap template

3a96ba9

Merge branch 'main' into ooo-zapier-webhook

befab1f

keithwillcode modified the milestones: v4.2, v4.3 Jun 17, 2024

dosubot bot modified the milestones: v4.3, v4.4 Jun 17, 2024

Merge branch 'main' into ooo-zapier-webhook

a684697

github-actions bot added the Low priority Created by Linear-GitHub Sync label Jun 18, 2024

PeerRich mentioned this pull request Jun 21, 2024

feat: OOO: webhook and zapier #15433

Closed

3 tasks

PeerRich modified the milestones: v4.4, v4.3 Jun 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: OOO webhook and zapier #15434

feat: OOO webhook and zapier #15434

alannnc commented Jun 14, 2024 •

edited

Loading

vercel bot commented Jun 14, 2024

algora-pbc bot commented Jun 14, 2024

github-actions bot commented Jun 14, 2024 •

edited

Loading

graphite-app bot commented Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

PeerRich Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

alannnc Jun 14, 2024

feat: OOO webhook and zapier #15434

Are you sure you want to change the base?

feat: OOO webhook and zapier #15434

Conversation

alannnc commented Jun 14, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Checklist

vercel bot commented Jun 14, 2024

algora-pbc bot commented Jun 14, 2024

github-actions bot commented Jun 14, 2024 • edited Loading

graphite-app bot commented Jun 14, 2024

Graphite Automations

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alannnc commented Jun 14, 2024 •

edited

Loading

github-actions bot commented Jun 14, 2024 •

edited

Loading