fix: Embed: Get correct snippet for Org events #12380

hariombalhara · 2023-11-16T05:33:24Z

What does this PR do?

This makes the embed snippet now work with org events without any manual change's requirement.

E2E Tests

Added e2e tests to verify that the orgSlug is present in code and bookerUrl for all types of embeds.
Now non-org event-types also verify their code
Code Verification is using eslint and node-html-parser to validate that valid JS code is there in snippets.

Fixes #11644

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Need to test codes in following cases
- Org + Self Hosting
- Org + Hosted
- NonOrg + Self Hosting
- NonOrg + Hosted
  See loom - https://www.loom.com/share/4e6696a6da704ae1b2d8146dd02c2a5a

Mandatory Tasks

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

vercel · 2023-11-16T05:33:32Z

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	Nov 16, 2023 0:08am
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 16, 2023 0:08am
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Nov 16, 2023 0:08am

4 Ignored Deployments

Name	Status	Preview	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview	Nov 16, 2023 0:08am
cal-demo	⬜️ Ignored (Inspect)	Visit Preview	Nov 16, 2023 0:08am
qa	⬜️ Ignored (Inspect)	Visit Preview	Nov 16, 2023 0:08am
ui	⬜️ Ignored (Inspect)	Visit Preview	Nov 16, 2023 0:08am

hariombalhara · 2023-11-16T05:33:35Z

Current dependencies on/for this PR:

main
- PR fix: Embed: Get correct snippet for Org events #12380 👈

This stack of pull requests is managed by Graphite.

github-actions · 2023-11-16T05:33:38Z

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

github-actions · 2023-11-16T05:40:47Z

📦 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 · 2023-11-16T05:41:44Z

Current Playwright Test Results Summary

✅ 318 Passing - ⚠️ 3 Flaky

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

(Last updated on 11/16/2023 12:15:52pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: f88bd5b

Started: 11/16/2023 12:09:52pm UTC

⚠️ Flakes

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Stripe integration Change stripe presented currency Should be able to change currency Retry 1 • Initial Attempt	0% (0) 0 / 290 runs failed over last 7 days	1.72% (5) 5 / 290 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.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
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	1.29% (4) 4 / 310 runs failed over last 7 days	56.77% (176) 176 / 310 runs flaked over last 7 days
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	17.42% (54) 54 / 310 runs failed over last 7 days	77.74% (241) 241 / 310 runs flaked over last 7 days

View Detailed Build Results

hariombalhara

Self review done

hariombalhara · 2023-11-16T09:00:48Z

apps/web/playwright/embed-code-generator.e2e.ts

+    });
+  });
+
+  test.describe("Organization", () => {


New tests to verify the code for organization events.

hariombalhara · 2023-11-16T09:04:06Z

apps/web/playwright/fixtures/users.ts

@@ -427,7 +427,7 @@ const createUserFixture = (user: UserWithIncludes, page: Page) => {
      }
      return membership;
    },
-    getOrg: async () => {
+    getOrgMembership: async () => {


Renamed to better convey what it does.

hariombalhara · 2023-11-16T09:04:54Z

apps/web/playwright/embed-code-generator.e2e.ts

  page.locator(`[data-testid=${embedType}]`).click();
 }

-async function gotToPreviewTab(page: Page) {


Renamed to goToPreviewTab - Typo fix

hariombalhara · 2023-11-16T09:05:23Z

packages/app-store-cli/src/build.ts

+    return `./${path.replace(/\\/g, "/")}/${moduleName
+      .replace(/\/index\.ts|\/index\.tsx/, "")
+      .replace(/\.tsx$|\.ts$/, "")}`;


Prettier autofix

hariombalhara · 2023-11-16T09:05:45Z

packages/features/embed/lib/EmbedCodes.tsx

@@ -53,7 +55,7 @@ export const Codes = {
      return code`
  import { getCalApi } from "@calcom/embed-react";
  import { useEffect } from "react";
-  export default function App() {
+  export default function MyApp() {


Renamed to make it same as inline embed code

zomars

Great work @hariombalhara looks good enough to merge

zomars added the core area: core, team members only label Nov 16, 2023

vercel bot deployed to Preview – ai November 16, 2023 05:37 View deployment

vercel bot deployed to Preview – api November 16, 2023 05:38 View deployment

vercel bot deployed to Preview – dev November 16, 2023 05:44 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from 605c46b to 1df00cb Compare November 16, 2023 06:51

vercel bot deployed to Preview – ai November 16, 2023 06:55 View deployment

vercel bot deployed to Preview – api November 16, 2023 06:55 View deployment

vercel bot deployed to Preview – dev November 16, 2023 06:59 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from 1df00cb to c0c9687 Compare November 16, 2023 07:02

vercel bot deployed to Preview – ai November 16, 2023 07:06 View deployment

vercel bot deployed to Preview – api November 16, 2023 07:06 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from c0c9687 to bc4361a Compare November 16, 2023 07:06

hariombalhara marked this pull request as ready for review November 16, 2023 07:06

vercel bot deployed to Preview – ai November 16, 2023 07:10 View deployment

vercel bot deployed to Preview – api November 16, 2023 07:11 View deployment

hariombalhara requested a review from a team November 16, 2023 07:15

hariombalhara self-assigned this Nov 16, 2023

hariombalhara changed the title ~~fix: Provide calOrigin for organization embeds~~ fix: Embed: Get correct snippet for Org events Nov 16, 2023

vercel bot deployed to Preview – dev November 16, 2023 07:16 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from bc4361a to 436f357 Compare November 16, 2023 08:07

vercel bot deployed to Preview – ai November 16, 2023 08:11 View deployment

vercel bot deployed to Preview – api November 16, 2023 08:12 View deployment

vercel bot deployed to Preview – dev November 16, 2023 08:13 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from 436f357 to 35e9eba Compare November 16, 2023 08:51

vercel bot deployed to Preview – api November 16, 2023 08:57 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from 35e9eba to caf63f0 Compare November 16, 2023 09:03

hariombalhara commented Nov 16, 2023

View reviewed changes

vercel bot deployed to Preview – ai November 16, 2023 09:07 View deployment

vercel bot deployed to Preview – api November 16, 2023 09:08 View deployment

vercel bot deployed to Preview – dev November 16, 2023 09:10 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from caf63f0 to bcd14a0 Compare November 16, 2023 10:44

vercel bot had a problem deploying to Preview – dev November 16, 2023 10:45 Failure

vercel bot had a problem deploying to Preview – api November 16, 2023 10:45 Failure

vercel bot had a problem deploying to Preview – ai November 16, 2023 10:47 Failure

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from bcd14a0 to bea4131 Compare November 16, 2023 10:49

vercel bot deployed to Preview – ai November 16, 2023 10:53 View deployment

vercel bot deployed to Preview – api November 16, 2023 10:53 View deployment

vercel bot deployed to Preview – dev November 16, 2023 10:56 View deployment

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from bea4131 to a04b62f Compare November 16, 2023 10:57

vercel bot deployed to Preview – ai November 16, 2023 11:00 View deployment

vercel bot deployed to Preview – api November 16, 2023 11:01 View deployment

vercel bot deployed to Preview – dev November 16, 2023 11:03 View deployment

fix: Provide calOrigin for organization embeds

f88bd5b

hariombalhara force-pushed the 11-16-fix_Provide_calOrigin_for_organization_embeds branch from a04b62f to f88bd5b Compare November 16, 2023 12:02

vercel bot deployed to Preview – api November 16, 2023 12:06 View deployment

vercel bot deployed to Preview – ai November 16, 2023 12:08 View deployment

vercel bot deployed to Preview – dev November 16, 2023 12:08 View deployment

keithwillcode requested a review from a team November 16, 2023 16:20

keithwillcode added embed area: embed, widget, react embed Medium priority Created by Linear-GitHub Sync labels Nov 16, 2023

zomars approved these changes Nov 27, 2023

View reviewed changes

zomars merged commit c9b50ff into main Nov 27, 2023
37 checks passed

zomars deleted the 11-16-fix_Provide_calOrigin_for_organization_embeds branch November 27, 2023 17:38

jakazzy pushed a commit to jakazzy/cal.com that referenced this pull request Dec 5, 2023

fix: Provide calOrigin for organization embeds (calcom#12380)

7cfc843

hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023

fix: Provide calOrigin for organization embeds (calcom#12380)

d6795a7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Embed: Get correct snippet for Org events #12380

fix: Embed: Get correct snippet for Org events #12380

hariombalhara commented Nov 16, 2023 •

edited

vercel bot commented Nov 16, 2023 •

edited

hariombalhara commented Nov 16, 2023

github-actions bot commented Nov 16, 2023 •

edited

github-actions bot commented Nov 16, 2023 •

edited

deploysentinel bot commented Nov 16, 2023 •

edited

Test Case Results

Top 1 Common Error Messages

Test Case Results

hariombalhara left a comment

hariombalhara Nov 16, 2023

hariombalhara Nov 16, 2023

hariombalhara Nov 16, 2023

hariombalhara Nov 16, 2023

hariombalhara Nov 16, 2023

zomars left a comment

fix: Embed: Get correct snippet for Org events #12380

fix: Embed: Get correct snippet for Org events #12380

Conversation

hariombalhara commented Nov 16, 2023 • edited

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

vercel bot commented Nov 16, 2023 • edited

hariombalhara commented Nov 16, 2023

github-actions bot commented Nov 16, 2023 • edited

github-actions bot commented Nov 16, 2023 • edited

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Nov 16, 2023 • edited

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Top 1 Common Error Messages

Test Case Results

hariombalhara left a comment

Choose a reason for hiding this comment

hariombalhara Nov 16, 2023

Choose a reason for hiding this comment

hariombalhara Nov 16, 2023

Choose a reason for hiding this comment

hariombalhara Nov 16, 2023

Choose a reason for hiding this comment

hariombalhara Nov 16, 2023

Choose a reason for hiding this comment

hariombalhara Nov 16, 2023

Choose a reason for hiding this comment

zomars left a comment

Choose a reason for hiding this comment

hariombalhara commented Nov 16, 2023 •

edited

vercel bot commented Nov 16, 2023 •

edited

github-actions bot commented Nov 16, 2023 •

edited

github-actions bot commented Nov 16, 2023 •

edited

deploysentinel bot commented Nov 16, 2023 •

edited