feat: jelly integration by diogeneshamilton · Pull Request #13929 · calcom/cal.com

diogeneshamilton · 2024-02-29T04:21:46Z

What does this PR do?

Adds Jelly integration. Thanks @baileypumfleet for all the help!

Requirement/Documentation

N/A

Type of change

New feature (non-breaking change which adds functionality)

How should this be tested?

please contact me (mat@jellyjelly.com) if you want the client_id and secret, or I can generate new ones for testing.

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

vercel · 2024-02-29T04:21:52Z

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

A member of the Team first needs to authorize it.

CLAassistant · 2024-02-29T04:21:54Z

All committers have signed the CLA.

github-actions · 2024-02-29T04:21:57Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

graphite-app · 2024-02-29T04:25:12Z

Graphite Automations

A Graphite automation took an action on this PR • (02/29/24)

1 reviewer was added based on Keith Williams's automation, 'Add consumer team as reviewer'

A Graphite automation took an action on this PR • (02/29/24)

1 label was added based on Keith Williams's automation, 'Add community label'

vercel · 2024-02-29T04:31:18Z

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

Name	Status	Preview	Comments	Updated (UTC)
ai	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Feb 29, 2024 4:33am

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Feb 29, 2024 4:33am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Feb 29, 2024 4:33am

github-actions · 2024-02-29T04:31:58Z

📦 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! 🙌

pumfleet

Looks all good to me, but will get an actually competent person to review this before I merge :)

diogeneshamilton · 2024-02-29T04:43:46Z

Looks all good to me, but will get an actually competent person to review this before I merge :)

Of course, thanks!

joeauyeung

Looks good so far. Just running into the issue of not being able to create new links.

Also left some formatting comments so the package fits the rest of the codebase.

packages/app-store/jelly/api/add.ts

packages/app-store/jelly/api/callback.ts

packages/app-store/jelly/lib/VideoApiAdapter.ts

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

diogeneshamilton · 2024-03-01T04:02:53Z

I'm pretty sure I've fixed all the reported issues and comments. 🤞 we're good now!

zomars · 2024-03-01T17:52:52Z

The lock file changes are missing

diogeneshamilton · 2024-03-01T18:19:37Z

@zomars I saw we were not supposed to commit the yarn.lock file if main package.json doesn't change? And there doesn't seem to be a lock file for any apps.

joeauyeung · 2024-03-01T18:21:08Z

Don't worry, fixed here #13949

zomars · 2024-03-01T18:59:07Z

@zomars I saw we were not supposed to commit the yarn.lock file if main package.json doesn't change? And there doesn't seem to be a lock file for any apps.

I get the confusion. But since we're adding a new package to the monorepo, it will trigger lockfile changes.

* v1 * don't need to search DB for user * return early if no user * use one deleteMany to ensure only 1 credential * rm expiration * fix API request * proper type * Update packages/app-store/jelly/lib/VideoApiAdapter.ts Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> * Update packages/app-store/jelly/lib/VideoApiAdapter.ts Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> * Update packages/app-store/jelly/lib/VideoApiAdapter.ts Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> * Update packages/app-store/jelly/api/callback.ts Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> * Fix callback URL --------- Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>

v1

907f705

graphite-app bot requested a review from a team February 29, 2024 04:21

graphite-app bot added the community Created by Linear-GitHub Sync label Feb 29, 2024

diogeneshamilton changed the title ~~jelly integration~~ feat: jelly integration Feb 29, 2024

vercel bot deployed to Preview – ai February 29, 2024 04:33 View deployment

vercel bot deployed to Preview – api February 29, 2024 04:37 View deployment

pumfleet reviewed Feb 29, 2024

View reviewed changes

keithwillcode added High priority Created by Linear-GitHub Sync app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar labels Feb 29, 2024

joeauyeung requested changes Feb 29, 2024

View reviewed changes

diogeneshamilton and others added 10 commits February 29, 2024 20:21

don't need to search DB for user

0c5a757

return early if no user

2478870

use one deleteMany to ensure only 1 credential

6252542

rm expiration

a2255c7

fix API request

71a7891

proper type

87c9a3b

Update packages/app-store/jelly/lib/VideoApiAdapter.ts

ca905ea

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

Update packages/app-store/jelly/lib/VideoApiAdapter.ts

b3738a3

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

Update packages/app-store/jelly/lib/VideoApiAdapter.ts

bfb6632

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

Update packages/app-store/jelly/api/callback.ts

538d869

Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>

CarinaWolli requested a review from joeauyeung March 1, 2024 15:07

Merge branch 'main' into jelly-integration

1e86824

joeauyeung and others added 2 commits March 1, 2024 10:54

Fix callback URL

b3be520

Merge branch 'main' into jelly-integration

0c32931

joeauyeung approved these changes Mar 1, 2024

View reviewed changes

CarinaWolli merged commit 3a4f944 into calcom:main Mar 1, 2024

nholden mentioned this pull request Jul 9, 2024

feat: Campsite conferencing app #15713

Merged

3 tasks

nangelina mentioned this pull request Sep 1, 2025

feat: KYZON Space Conferencing App #23486

Open

3 tasks

Comments

Conversation

diogeneshamilton commented Feb 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

Uh oh!

vercel bot commented Feb 29, 2024

Uh oh!

CLAassistant commented Feb 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Feb 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

graphite-app bot commented Feb 29, 2024

Graphite Automations

Uh oh!

vercel bot commented Feb 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Feb 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📦 Next.js Bundle Analysis for @calcom/web

Uh oh!

pumfleet left a comment

Choose a reason for hiding this comment

Uh oh!

diogeneshamilton commented Feb 29, 2024

Uh oh!

joeauyeung left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

diogeneshamilton commented Mar 1, 2024

Uh oh!

zomars commented Mar 1, 2024

Uh oh!

diogeneshamilton commented Mar 1, 2024

Uh oh!

joeauyeung commented Mar 1, 2024

Uh oh!

zomars commented Mar 1, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

diogeneshamilton commented Feb 29, 2024 •

edited

Loading

CLAassistant commented Feb 29, 2024 •

edited

Loading

github-actions bot commented Feb 29, 2024 •

edited

Loading

vercel bot commented Feb 29, 2024 •

edited

Loading

github-actions bot commented Feb 29, 2024 •

edited

Loading