refactor: Add `crm` type to app credentials #14147

joeauyeung · 2024-03-20T01:07:30Z

What does this PR do?

This is a part of our bigger CRM refactor.

Currently, our CRM apps have the type of _other_calendar which gets processed with our other calendar apps. This PR aims to introduce the _crm type to credentials in preparation for a CRM manager. Since this is a bigger change I wanted it to be it's own PR to make reviewing easier.

Changes

Moved Zoho Bigin under the CRM category
Removed Sendgrid from the CRM category (still being treated as other_calendar
Changed CRM apps metadata to
- Variant to "crm"
- Type to "{appName}_crm"
For querying installed apps with metadata we are now matching apps based on their slug and not their type
CRM apps finally are listed under the CRM category (this one bugged me a lot!)

Fixes # (issue)

Requirement/Documentation

If there is a requirement document, please, share it here.
If there is a UI/UX design document, please, share it here.

Type of change

Bug fix (non-breaking change which fixes an issue)
Chore (refactoring code, technical debt, workflow improvements)

How should this be tested?

Install each CRM and ensure they're being read on new bookings

Mandatory Tasks

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

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

…mezone

…reds

joeauyeung · 2024-03-20T01:07:44Z

refactor: Add crm type to app credentials #14147 👈
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @joeauyeung and the rest of your teammates on Graphite

github-actions · 2024-03-20T01:07:44Z

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

vercel · 2024-03-20T01:08:01Z

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

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
ai	⬜️ Ignored (Inspect)	Visit Preview	Apr 9, 2024 4:30pm
cal	⬜️ Ignored (Inspect)	Visit Preview	Apr 9, 2024 4:30pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview	Apr 9, 2024 4:30pm
qa	⬜️ Ignored (Inspect)	Visit Preview	Apr 9, 2024 4:30pm

github-actions · 2024-03-20T01:16:30Z

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

deploysentinel · 2024-03-20T01:17:33Z

Current Playwright Test Results Summary

✅ 301 Passing - ⚠️ 18 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 04/09/2024 04:45:06pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 58a0cb7

Started: 04/09/2024 04:41:22pm UTC

⚠️ Flakes

📄 apps/web/playwright/insights.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Insights should be able to go to insights as admins Retry 1 • Initial Attempt	0% (0) 0 / 316 runs failed over last 7 days	4.11% (13) 13 / 316 runs flaked over last 7 days
Insights should be able to go to insights as members Retry 1 • Initial Attempt	0% (0) 0 / 316 runs failed over last 7 days	2.22% (7) 7 / 316 runs flaked over last 7 days

📄 apps/web/playwright/profile.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Update Profile Can add a new email as a secondary email Retry 1 • Initial Attempt	0.31% (1) 1 / 326 run failed over last 7 days	0.61% (2) 2 / 326 runs flaked over last 7 days
Update Profile Can resend verification link if the secondary email is unverified Retry 1 • Initial Attempt	4.01% (13) 13 / 324 runs failed over last 7 days	14.20% (46) 46 / 324 runs flaked over last 7 days

📄 apps/web/playwright/organization/organization-invitation.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Organization Email matching orgAutoAcceptEmail and a Verified Organization with DNS Setup Done nonexisting user is invited to a team inside organization Retry 1 • Initial Attempt	1.18% (3) 3 / 255 runs failed over last 7 days	10.20% (26) 26 / 255 runs flaked over last 7 days

📄 apps/web/playwright/integrations-stripe.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Stripe integration Pending payment booking should not be confirmed by default Retry 2 • Retry 1 • Initial Attempt	1.26% (4) 4 / 317 runs failed over last 7 days	25.24% (80) 80 / 317 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 8 Flakes

Top 1 Common Error Messages

`null`	8 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should open embed iframe on click - Configured with light theme Retry 1 • Initial Attempt	0.31% (1) 1 / 319 run failed over last 7 days	61.13% (195) 195 / 319 runs flaked over last 7 days
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	-157.72% (-194) -194 / 123 runs failed over last 7 days	157.72% (194) 194 / 123 runs flaked over last 7 days
Popup Tests should open Routing Forms embed on click Retry 1 • Initial Attempt	-156.91% (-193) -193 / 123 runs failed over last 7 days	156.91% (193) 193 / 123 runs flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when no theme is configured through Embed API Retry 1 • Initial Attempt	-156.10% (-192) -192 / 123 runs failed over last 7 days	156.91% (193) 193 / 123 runs flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe according to system theme when configured with 'auto' theme using Embed API Retry 1 • Initial Attempt	-158.20% (-193) -193 / 122 runs failed over last 7 days	158.20% (193) 193 / 122 runs flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe(Booker Profile Page) with dark theme when configured with dark theme using Embed API Retry 1 • Initial Attempt	-158.20% (-193) -193 / 122 runs failed over last 7 days	158.20% (193) 193 / 122 runs flaked over last 7 days
Popup Tests Floating Button Popup Pro User - Configured in App with default setting of system theme should open embed iframe(Event Booking Page) with dark theme when configured with dark theme using Embed API Retry 1 • Initial Attempt	-158.20% (-193) -193 / 122 runs failed over last 7 days	158.20% (193) 193 / 122 runs flaked over last 7 days
Popup Tests prendered embed should be loaded and apply the config given to it Retry 1 • Initial Attempt	-158.20% (-193) -193 / 122 runs failed over last 7 days	158.20% (193) 193 / 122 runs flaked over last 7 days

📄 apps/web/playwright/webhook.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
FORM_SUBMITTED on submitting team form, triggers team webhook Retry 1 • Initial Attempt	0.62% (2) 2 / 323 runs failed over last 7 days	24.46% (79) 79 / 323 runs flaked over last 7 days

📄 apps/web/playwright/teams.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Teams - NonOrg -- future Team Onboarding Invite Members Retry 1 • Initial Attempt	7.95% (26) 26 / 327 runs failed over last 7 days	22.63% (74) 74 / 327 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/preview.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Preview Preview - embed-core should load Retry 1 • Initial Attempt	0% (0) 0 / 320 runs failed over last 7 days	33.44% (107) 107 / 320 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/inline.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Inline Iframe Inline Iframe - Configured with Dark Theme Retry 1 • Initial Attempt	0.63% (2) 2 / 320 runs failed over last 7 days	52.19% (167) 167 / 320 runs flaked over last 7 days

View Detailed Build Results

graphite-app · 2024-04-05T17:10:13Z

Graphite Automations

"Add foundation team as reviewer" took an action on this PR • (04/05/24)

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

sean-brydon · 2024-04-09T09:26:25Z

LGTM again - just re-running CI as e2e failing. Doesnt seem relevant to this PR , they may be flaky

zomars · 2024-04-10T18:50:47Z

@sean-brydon @joeauyeung Code LGTM. But how are we going to update the App records in the DB without a proper migration?

joeauyeung · 2024-04-10T19:01:07Z

@sean-brydon @joeauyeung Code LGTM. But how are we going to update the App records in the DB without a proper migration?

In the next PR in this stack I made it so credentials with "_other_calendar" are still treated as CRM apps. What are your thoughts? Should we still write a DB migration?

Shaik-Sirajuddin and others added 18 commits March 18, 2024 17:12

fix timezone display on booking page to reflect event availability ti…

bad017a

…mezone

migrate fetching event owner's schedule to server side

e4f9679

migrate fetching event owner's schedule to server side

2dc2272

fix e2e test errors

12f228f

Merge branch 'calcom:main' into main

df6672e

Merge branch 'main' of https://github.com/Shaik-Sirajuddin/cal.com

5f274fc

Merge branch 'main' into main

4cd9236

Merge branch 'calcom:main' into main

dc45e8c

Add WEBAPP_URL_FOR_OAUTH to salesforce auth

046a3a0

In event manager constructor include "_crm" credentials as calendar c…

2f19c18

…reds

Change crm apps to type to end with _crm

58eb841

Move sendgrid out of CRM

4ce8a85

Add zoho bigin to CRM apps

288915e

When getting apps, use slug

1777a3a

Add crm variants

a9bb57f

Hubspot Oauth use WEBAPP_URL_FOR_OAUTH

698d41e

Refactor creating credentials

d40835e

Fix empty CRM page

bbc068f

keithwillcode added consumer core area: core, team members only labels Mar 20, 2024

joeauyeung changed the title ~~Add WEBAPP_URL_FOR_OAUTH to salesforce auth~~ refactor: Add crm type to app credentials Mar 20, 2024

vercel bot deployed to Preview – ai March 20, 2024 01:08 View deployment

vercel bot deployed to Preview – api March 20, 2024 01:11 View deployment

vercel bot deployed to Preview – dev March 20, 2024 01:20 View deployment

Use credentials with _crm

747c71a

vercel bot deployed to Preview – dev April 4, 2024 19:07 View deployment

Merge branch 'main' into add-crm-app-type

8b1b206

vercel bot deployed to Preview – api April 5, 2024 14:24 View deployment

vercel bot deployed to Preview – dev April 5, 2024 14:38 View deployment

Fix tests

9c2cb92

joeauyeung dismissed sean-brydon’s stale review via 9c2cb92 April 5, 2024 17:08

graphite-app bot requested a review from a team April 5, 2024 17:08

vercel bot deployed to Preview – api April 5, 2024 17:13 View deployment

Type fix

de1c55d

vercel bot deployed to Preview – api April 5, 2024 17:22 View deployment

Merge branch 'main' into add-crm-app-type

d9368a6

joeauyeung requested a review from sean-brydon April 5, 2024 17:33

vercel bot deployed to Preview – ai April 5, 2024 17:35 View deployment

vercel bot deployed to Preview – api April 5, 2024 17:39 View deployment

vercel bot deployed to Preview – dev April 5, 2024 18:01 View deployment

Merge branch 'main' into add-crm-app-type

7680e9f

vercel bot deployed to Preview – ai April 8, 2024 13:51 View deployment

vercel bot deployed to Preview – api April 8, 2024 13:55 View deployment

vercel bot deployed to Preview – dev April 8, 2024 14:07 View deployment

Merge branch 'main' into add-crm-app-type

58a0cb7

sean-brydon approved these changes Apr 9, 2024

View reviewed changes

joeauyeung enabled auto-merge (squash) April 9, 2024 16:31

vercel bot deployed to Preview – api April 9, 2024 16:36 View deployment

joeauyeung merged commit 4a88b33 into main Apr 9, 2024
38 of 39 checks passed

joeauyeung deleted the add-crm-app-type branch April 9, 2024 16:46

vercel bot deployed to Preview – dev April 9, 2024 16:48 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Add `crm` type to app credentials #14147

refactor: Add `crm` type to app credentials #14147

joeauyeung commented Mar 20, 2024 •

edited

joeauyeung commented Mar 20, 2024

github-actions bot commented Mar 20, 2024 •

edited

vercel bot commented Mar 20, 2024 •

edited

github-actions bot commented Mar 20, 2024 •

edited

deploysentinel bot commented Mar 20, 2024 •

edited

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

graphite-app bot commented Apr 5, 2024

sean-brydon commented Apr 9, 2024

zomars commented Apr 10, 2024

joeauyeung commented Apr 10, 2024

refactor: Add crm type to app credentials #14147

refactor: Add crm type to app credentials #14147

Conversation

joeauyeung commented Mar 20, 2024 • edited

What does this PR do?

Changes

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

Checklist

joeauyeung commented Mar 20, 2024

github-actions bot commented Mar 20, 2024 • edited

vercel bot commented Mar 20, 2024 • edited

github-actions bot commented Mar 20, 2024 • edited

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Mar 20, 2024 • edited

Current Playwright Test Results Summary

⚠️ Flakes

Top 1 Common Error Messages

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

graphite-app bot commented Apr 5, 2024

Graphite Automations

sean-brydon commented Apr 9, 2024

zomars commented Apr 10, 2024

joeauyeung commented Apr 10, 2024

refactor: Add `crm` type to app credentials #14147

refactor: Add `crm` type to app credentials #14147

joeauyeung commented Mar 20, 2024 •

edited

github-actions bot commented Mar 20, 2024 •

edited

vercel bot commented Mar 20, 2024 •

edited

github-actions bot commented Mar 20, 2024 •

edited

deploysentinel bot commented Mar 20, 2024 •

edited