feat: make.com/integromat app #8897

aar2dee2 · 2023-05-15T08:24:06Z

What does this PR do?

Fixes #1550
/attempt #1550

Environment: Staging(main branch) / Production

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

Test A
Test B

Checklist

I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

vercel · 2023-05-15T08:24:10Z

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

Name	Status	Preview	Comments	Updated (UTC)
api	🔄 Building (Inspect)			Sep 4, 2023 2:47pm
cal	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 4, 2023 2:47pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 4, 2023 2:47pm
web-staging	🔄 Building (Inspect)			Sep 4, 2023 2:47pm

vercel · 2023-05-15T08:24:12Z

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

A member of the Team first needs to authorize it.

github-actions · 2023-05-15T08:35:25Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

joeauyeung · 2023-05-16T11:53:10Z

Hi @aar2dee2, great start on the app so far. I'm going to convert this PR to a draft as this isn't fully flushed out yet. Once you are done feel free to mark this PR as ready for review.

PeerRich · 2023-05-24T17:06:59Z

@aar2dee2 whats missing here to be ready for review?

aar2dee2 · 2023-05-25T05:17:11Z

@aar2dee2 whats missing here to be ready for review?

Hi @PeerRich
Still working on this, I'll push some commits in a few hours.

aar2dee2 · 2023-05-25T15:31:23Z

So, I've got the webhooks & modules setup. Auth is working using a cal.com API key (similar to Zapier integration).
Few changes needed, should be ready for review tomorrow.
https://www.loom.com/share/00c29d32c7b64f9fb50e8cce29fcde32

aar2dee2 · 2023-05-25T15:46:47Z

There a number of handlers that import the nodeScheduler from the Zapier app to perform an action when bookings are created/deleted etc. Do we want to follow the same approach for the Make integration?

Will we need to handle Make as Zapier is handled in the files below?

@PeerRich tagging you, not sure who's the right person to answer this.

aar2dee2 · 2023-05-27T12:55:45Z

Working integration with Google Sheets:
https://www.loom.com/share/dd74c25570c2438a8d0e2fc354df73af

hariombalhara

Code looks good to me now!! Great work @aar2dee2. Conflicts need to be resolved though before merge which I think @CarinaWolli will help with that.

…into integromat-app

CarinaWolli · 2023-08-31T18:42:13Z

packages/prisma/seed-app-store.ts

@@ -337,7 +337,9 @@ export default async function main() {
      invite_link: process.env.ZAPIER_INVITE_LINK,
    });
  }
-
+  await createApp("make", "make", ["automation"], "make_automation", {
+    invite_link: "https://make.com/en/hq/app-invitation/6cb2772b61966508dd8f414ba3b44510",


i'll take a look at how we can get the app published, so we won't need the link no more

There's a section to apply for review within the app I created on Make. I'll get it started and open another PR here so we can track the progress.

CarinaWolli

I fixed the conflicts and made some small changes. Looks good to me now, great work 🙌🏻

Invite link is available on setup page. Will be removed once cal.com app is publish in Make

elie222

Typo

elie222 · 2023-09-05T15:24:21Z

apps/web/public/static/locales/en/common.json

@@ -1089,6 +1092,7 @@
  "or_lowercase": "or",
  "nevermind": "Nevermind",
  "go_to": "Go to: ",
+  "invite_link_make": "<li>Go to<a>Make Invite Link</a> and install Cal.com appp</li>",


Typo here. It's app

thx. will fix in a different PR

PeerRich · 2023-09-05T20:56:53Z

what do we need here @aar2dee2 ?

aar2dee2 · 2023-09-06T04:29:25Z

what do we need here @aar2dee2 ?

We need to copy the invite link from the app store README. Here's the link https://www.make.com/en/hq/app-invitation/6cb2772b61966508dd8f414ba3b44510

I'm thinking we can also add the invite link to the app description in the app store until we have a public app on Make?

CarinaWolli · 2023-09-06T18:07:22Z

@aar2dee2 I think it should be fine to have the invite link on the Make setup page until the app is public. I somehow messed that up in this PR, but just opened a fix: #11177

start make app integration

aa59464

vercel bot deployed to Preview – ui May 15, 2023 08:29 View deployment

joeauyeung marked this pull request as draft May 16, 2023 11:53

Merge branch 'main' into integromat-app

6d9c0fa

PeerRich changed the title ~~start make.com/integromat app integration~~ feat: start make.com/integromat app integration May 24, 2023

PeerRich changed the title ~~feat: start make.com/integromat app integration~~ feat: make.com/integromat app May 24, 2023

aar2dee2 added 3 commits May 25, 2023 10:56

Merge branch 'main' into integromat-app

be0a13d

setup integration

e639b88

add relevant env vars

21f3c61

github-actions bot added the ❗️ .env changes contains changes to env variables label May 25, 2023

vercel bot deployed to Preview – ui May 25, 2023 10:51 View deployment

update app metadata

75a4731

vercel bot deployed to Preview – ui May 25, 2023 11:25 View deployment

aar2dee2 added 3 commits May 25, 2023 17:28

import setup route in app setups

a47f36a

fix typo

cacd62b

add app store imports

993f8bb

vercel bot deployed to Preview – ui May 25, 2023 13:09 View deployment

fix module import error

684e231

PeerRich added Medium priority Created by Linear-GitHub Sync app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar labels May 25, 2023

update make readme

c356f18

vercel bot deployed to Preview – dev August 31, 2023 10:33 View deployment

fix app setup handler

2d63712

vercel bot had a problem deploying to Preview – ui August 31, 2023 10:49 Failure

Fix type issue

2bc478b

hariombalhara previously approved these changes Aug 31, 2023

View reviewed changes

vercel bot had a problem deploying to Preview – ui August 31, 2023 12:12 Failure

always show app invite link

0a50ce6

aar2dee2 dismissed hariombalhara’s stale review via 0a50ce6 August 31, 2023 16:40

vercel bot had a problem deploying to Preview – ui August 31, 2023 16:44 Failure

Merge branch 'main' into integromat-app

4a84a16

vercel bot had a problem deploying to Preview – ui August 31, 2023 17:53 Failure

CarinaWolli and others added 2 commits August 31, 2023 13:57

fix type error

fdcc6a8

Merge branch 'main' into integromat-app

d58d71b

vercel bot had a problem deploying to Preview – ui August 31, 2023 18:05 Failure

CarinaWolli added 2 commits August 31, 2023 14:37

add make invite link

c35c0aa

Merge branch 'integromat-app' of https://github.com/aar2dee2/cal.com …

711c533

…into integromat-app

CarinaWolli reviewed Aug 31, 2023

View reviewed changes

vercel bot had a problem deploying to Preview – ui August 31, 2023 18:44 Failure

CarinaWolli approved these changes Aug 31, 2023

View reviewed changes

CarinaWolli requested a review from zomars August 31, 2023 19:04

CarinaWolli enabled auto-merge (squash) September 1, 2023 12:33

Merge branch 'main' into integromat-app

ef684b5

vercel bot deployed to Preview – ui September 4, 2023 14:47 View deployment

CarinaWolli merged commit b27f014 into calcom:main Sep 4, 2023

elie222 reviewed Sep 5, 2023

View reviewed changes

CarinaWolli mentioned this pull request Sep 6, 2023

fix: add make invite link to setup page #11177

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: make.com/integromat app #8897

feat: make.com/integromat app #8897

aar2dee2 commented May 15, 2023

vercel bot commented May 15, 2023 •

edited

Loading

vercel bot commented May 15, 2023

github-actions bot commented May 15, 2023 •

edited

Loading

joeauyeung commented May 16, 2023

PeerRich commented May 24, 2023

aar2dee2 commented May 25, 2023

aar2dee2 commented May 25, 2023

aar2dee2 commented May 25, 2023

aar2dee2 commented May 27, 2023

hariombalhara left a comment

CarinaWolli Aug 31, 2023

aar2dee2 Sep 1, 2023

CarinaWolli left a comment

elie222 left a comment

elie222 Sep 5, 2023

PeerRich Sep 5, 2023

PeerRich commented Sep 5, 2023

aar2dee2 commented Sep 6, 2023

CarinaWolli commented Sep 6, 2023

feat: make.com/integromat app #8897

feat: make.com/integromat app #8897

Conversation

aar2dee2 commented May 15, 2023

What does this PR do?

Type of change

How should this be tested?

Checklist

vercel bot commented May 15, 2023 • edited Loading

vercel bot commented May 15, 2023

github-actions bot commented May 15, 2023 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

joeauyeung commented May 16, 2023

PeerRich commented May 24, 2023

aar2dee2 commented May 25, 2023

aar2dee2 commented May 25, 2023

aar2dee2 commented May 25, 2023

aar2dee2 commented May 27, 2023

hariombalhara left a comment

Choose a reason for hiding this comment

CarinaWolli Aug 31, 2023

Choose a reason for hiding this comment

aar2dee2 Sep 1, 2023

Choose a reason for hiding this comment

CarinaWolli left a comment

Choose a reason for hiding this comment

elie222 left a comment

Choose a reason for hiding this comment

elie222 Sep 5, 2023

Choose a reason for hiding this comment

PeerRich Sep 5, 2023

Choose a reason for hiding this comment

PeerRich commented Sep 5, 2023

aar2dee2 commented Sep 6, 2023

CarinaWolli commented Sep 6, 2023

vercel bot commented May 15, 2023 •

edited

Loading

github-actions bot commented May 15, 2023 •

edited

Loading