fix: set conferencing apps as default #15376

Amit91848 · 2024-06-08T11:14:38Z

What does this PR do?

Fixes [CAL-3903] set conferencing apps as default #15375
Fixes CAL-3903

Recording.2024-06-08.163855.mp4

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)

vercel · 2024-06-08T11:14:43Z

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

A member of the Team first needs to authorize it.

github-actions · 2024-06-08T11:14:49Z

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

graphite-app · 2024-06-08T11:15:12Z

Graphite Automations

"Add community label" took an action on this PR • (06/08/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/08/24)

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

Amit91848 · 2024-06-08T11:17:21Z

when you sign up for a new account and choose Google Meet as the default meeting platform, for some reason it still keeps Cal Video as the default and you have to go to settings to change it manually

It was installing normally and not setting it as default. I have added it to google meet only for now? Do want me to add it to all conferencing apps?

SomayChauhan · 2024-06-08T11:19:41Z

Thank you, @Amit91848.

It was installing normally and not setting it as default. I have added it to google meet only for now? Do want me to add it to all conferencing apps?

can you add it for all the oAuth-based conferencing apps

Amit91848 · 2024-06-08T11:20:54Z

Sure @SomayChauhan

Amit91848 · 2024-06-08T12:15:44Z

Added @SomayChauhan

PeerRich

looks nice, but can we sort video conferencing apps by popularity as well? We sort calendars already by popularity

ideally Google Meet (and Zoom etc.) is at the top

misclicked

Amit91848 · 2024-06-09T15:42:20Z

Will do @PeerRich

Amit91848 · 2024-06-09T16:55:50Z

looks nice, but can we sort video conferencing apps by popularity as well? We sort calendars already by popularity

ideally Google Meet (and Zoom etc.) is at the top

Just checked it is already being sorted by popularity, local development doesn't have app count so isn't being reflected @PeerRich

PeerRich · 2024-06-09T17:17:44Z

ah very nice

SomayChauhan

LGTM!
ThankYou for the fix @Amit91848
added a small fix in 20fdb50
where the default event-types we create for the new user were not picking up the default app we just set.

PS: For OAuth apps, where the link is generated automatically we set the newly added conferencing app as the default location for all event types. For link-based apps, users can manually set the location.

github-actions · 2024-06-26T00:17:47Z

This PR is being marked as stale due to inactivity.

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

hariombalhara

@Amit91848 I really want to avoid making changes in the _getAdd or callback.ts of apps because that would mean a lot of apps would need to be modified and all new conferencing apps would have to be ensured to have that code

Suggested a different approach, let us see if it works

Amit91848 · 2024-07-09T08:34:17Z

@hariombalhara updated the code. I haven't removed default install from _add.ts and callback.ts yet, but they aren't being used. Just wanted to confirm the flow first. Couldn't find any common file for all, decided to create an endpoint to update the default because we cannot directly run setDefaultConferencingApp in browser.

SomayChauhan · 2024-07-09T12:06:24Z

#15702 should be merged before this pr is merged

hariombalhara · 2024-07-10T04:50:34Z

The flow looks good now. @Amit91848 you can now cleanup the app files.

There is some more code improvements that are required. I would leave the comments inline though.

packages/app-store/components.tsx

hariombalhara

Left inline comments.

apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx

hariombalhara · 2024-07-10T10:14:06Z

apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx

                      installed={item.userCredentialIds.length > 0}
+                      defaultInstall={
+                        !defaultConferencingApp && item.appData?.location?.linkType === "dynamic"


We should allow making a conferencing app as default only if there is no existing default conferencing app.

hariombalhara · 2024-07-10T10:15:58Z

Looks good to me now !! Thanks for bearing with me.

Not approving the PR yet as another PR needs to be merged first.

- as we reverted calcom@20fdb50

…app_default_onboarding

* commit '0dd3b2562458522ad002b4ea967e2b10855a4ab6': (130 commits) chore: v4.2.5 (calcom#15735) fix: api v2 unit tests (calcom#15733) fix: event type back button (calcom#15722) fix: remove console.log and tsignore apiv2 (calcom#15732) fix: api-v2 controllers e2e tests (calcom#15724) fix: Text in Embed Code Visibility Fixed (calcom#15711) chore: sort calendar crendentials in event manager (calcom#15448) chore: cache org guard and fix roles guard apiv2 (calcom#15719) Revert "fix: Autodetection of time zone only updated default time zone (calcom#15392)" (calcom#15720) feat: add POST end point to mark calls as no-shows (calcom#15690) chore: add i18n to atoms (calcom#15698) fix: set conferencing apps as default (calcom#15376) fix: disable google-meet in user onboarding if google-calendar is not installed (calcom#15702) fix: Rescheduling email when there is broken calendar integration (calcom#15669) chore: v4.2.4 (calcom#15703) fix: 404s becoming 500s (calcom#15696) fix: delete reserved slot on booker unmount (calcom#15700) chore: add caching apiv2 roles guard (calcom#15694) refactor: handleNewBooking calcom#3 (calcom#15612) fix: incorrect booking seats full error on collective seated event (calcom#15602) ... # Conflicts: # packages/emails/templates/attendee-request-email.ts # packages/emails/templates/attendee-was-requested-to-reschedule-email.ts # packages/emails/templates/organizer-cancelled-email.ts # packages/emails/templates/organizer-location-change-email.ts # packages/emails/templates/organizer-payment-refund-failed-email.ts # packages/emails/templates/organizer-request-email.ts # packages/emails/templates/organizer-request-reminder-email.ts # packages/emails/templates/organizer-requested-to-reschedule-email.ts # packages/emails/templates/organizer-rescheduled-email.ts # packages/emails/templates/organizer-scheduled-email.ts

* fix: set conferencing apps as default * fix in other oauth conferencing apps * creating default event-types should set the user's default location * Update getDefaultLocations.ts * fix: unit test * default install only for first oauth app * fix: type-check * update default on success * fix: pass callback prop * chore: code cleanup * Fix condition * no longer needed - as we reverted calcom@20fdb50 --------- Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com> Co-authored-by: Hariom <hariombalhara@gmail.com>

fix: set conferencing apps as default

e76b3a1

graphite-app bot requested a review from a team June 8, 2024 11:14

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

github-actions bot added Medium priority Created by Linear-GitHub Sync 🐛 bug Something isn't working labels Jun 8, 2024

dosubot bot added the app-store area: app store, apps, calendar integrations, google calendar, outlook, lark, apple calendar label Jun 8, 2024

fix in other oauth conferencing apps

43e3733

Merge branch 'main' into fix/set_conferencing_app_default_onboarding

612b6e4

PeerRich previously approved these changes Jun 9, 2024

View reviewed changes

PeerRich requested a review from SomayChauhan June 9, 2024 15:38

creating default event-types should set the user's default location

20fdb50

SomayChauhan reviewed Jun 10, 2024

View reviewed changes

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

github-actions bot added the Stale label Jun 26, 2024

SomayChauhan added 2 commits June 28, 2024 16:32

Merge branch 'main' into pr/15376

f221937

Update getDefaultLocations.ts

d0f477b

hariombalhara reviewed Jul 9, 2024

View reviewed changes

packages/app-store/office365video/api/callback.ts Outdated Show resolved Hide resolved

hariombalhara requested changes Jul 9, 2024

View reviewed changes

vercel bot deployed to Preview – ai July 9, 2024 07:40 View deployment

vercel bot deployed to Preview – api July 9, 2024 07:45 View deployment

vercel bot deployed to Preview – dev July 9, 2024 07:59 View deployment

update default on success

22e7004

Amit91848 requested a review from hariombalhara July 9, 2024 09:05

hariombalhara reviewed Jul 10, 2024

View reviewed changes

packages/app-store/components.tsx Outdated Show resolved Hide resolved

hariombalhara requested changes Jul 10, 2024

View reviewed changes

Amit91848 and others added 3 commits July 10, 2024 09:11

fix: pass callback prop

1b2755b

chore: code cleanup

ba576a1

Merge branch 'main' into fix/set_conferencing_app_default_onboarding

989ed04

Amit91848 requested a review from hariombalhara July 10, 2024 09:26

hariombalhara reviewed Jul 10, 2024

View reviewed changes

apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx Outdated Show resolved Hide resolved

Fix condition

7053e1f

hariombalhara force-pushed the fix/set_conferencing_app_default_onboarding branch from 328caaf to 7053e1f Compare July 10, 2024 10:13

hariombalhara reviewed Jul 10, 2024

View reviewed changes

SomayChauhan and others added 2 commits July 10, 2024 16:08

no longer needed

524c0cf

- as we reverted calcom@20fdb50

Merge remote-tracking branch 'origin/main' into fix/set_conferencing_…

c339c65

…app_default_onboarding

hariombalhara self-requested a review July 10, 2024 10:42

hariombalhara approved these changes Jul 10, 2024

View reviewed changes

hariombalhara enabled auto-merge (squash) July 10, 2024 10:42

hariombalhara merged commit caf7943 into calcom:main Jul 10, 2024

p6l-richard mentioned this pull request Jul 24, 2024

fix(marketing): move the sitemap for search engines to core app #15893

Closed

3 tasks

fix: set conferencing apps as default #15376

fix: set conferencing apps as default #15376

Uh oh!

Conversation

Amit91848 commented Jun 8, 2024

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

Uh oh!

vercel bot commented Jun 8, 2024

Uh oh!

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

Uh oh!

Uh oh!

graphite-app bot commented Jun 8, 2024

Graphite Automations

Uh oh!

Amit91848 commented Jun 8, 2024

Uh oh!

SomayChauhan commented Jun 8, 2024

Uh oh!

Amit91848 commented Jun 8, 2024

Uh oh!

Amit91848 commented Jun 8, 2024

Uh oh!

PeerRich left a comment

Choose a reason for hiding this comment

Uh oh!

Amit91848 commented Jun 9, 2024

Uh oh!

Amit91848 commented Jun 9, 2024

Uh oh!

PeerRich commented Jun 9, 2024

Uh oh!

SomayChauhan left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jun 26, 2024

Uh oh!

Uh oh!

hariombalhara left a comment

Choose a reason for hiding this comment

Uh oh!

Amit91848 commented Jul 9, 2024

Uh oh!

SomayChauhan commented Jul 9, 2024

Uh oh!

hariombalhara commented Jul 10, 2024

Uh oh!

Uh oh!

hariombalhara left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hariombalhara Jul 10, 2024

Choose a reason for hiding this comment

Uh oh!

hariombalhara commented Jul 10, 2024

Uh oh!

Uh oh!

github-actions bot commented Jun 8, 2024 •

edited

Loading

SomayChauhan left a comment •

edited

Loading