Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Support embedding org profile page #12116

Merged
merged 5 commits into from
Oct 30, 2023

Conversation

hariombalhara
Copy link
Member

@hariombalhara hariombalhara commented Oct 27, 2023

What does this PR do?

Fixes #12072

  • Makes Org profile page embeddable
  • Also setup checkly config and wrote 5 types of embed scenarios tests for orgs.
    • Using checkly tests because these involve testing next.config.js rewrites testing which is much reliably tested on a deployed instance.

Type of change

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

How should this be tested?

  • Simply try accessing any org's /embed route. e.g. calcom.cal.local:3000/embed. It was 404 earlier and now it shows the embedded version of calcom.cal.local:3000

Mandatory Tasks

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

TODO After Go Live

  • Deploy checkly tests

@hariombalhara hariombalhara force-pushed the Support_embedding_org_profile_page branch from 299cb50 to ae3a505 Compare October 27, 2023 11:58
@vercel
Copy link

vercel bot commented Oct 27, 2023

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

Name Status Preview Comments Updated (UTC)
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 30, 2023 11:02am
qa 🔄 Building (Inspect) Visit Preview 💬 Add feedback Oct 30, 2023 11:02am
5 Ignored Deployments
Name Status Preview Comments Updated (UTC)
ai ⬜️ Ignored (Inspect) Visit Preview Oct 30, 2023 11:02am
api ⬜️ Ignored (Inspect) Visit Preview Oct 30, 2023 11:02am
cal ⬜️ Ignored (Inspect) Visit Preview Oct 30, 2023 11:02am
cal-demo ⬜️ Ignored (Inspect) Visit Preview Oct 30, 2023 11:02am
ui ⬜️ Ignored (Inspect) Visit Preview Oct 30, 2023 11:02am

@hariombalhara
Copy link
Member Author

hariombalhara commented Oct 27, 2023

@github-actions
Copy link
Contributor

github-actions bot commented Oct 27, 2023

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

Base automatically changed from e2e/org-booking to main October 27, 2023 12:44
@hariombalhara hariombalhara force-pushed the Support_embedding_org_profile_page branch from ae3a505 to 922eb24 Compare October 27, 2023 12:45
@zomars zomars added the core area: core, team members only label Oct 27, 2023
@hariombalhara hariombalhara force-pushed the Support_embedding_org_profile_page branch from 922eb24 to d304823 Compare October 27, 2023 12:47
@socket-security
Copy link

New dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
@types/bcryptjs 2.4.2 None +0 7.93 kB types
next-validations 0.2.1 eval +0 273 kB jellydn
mailhog 4.16.0 None +0 51.2 kB blueimp
checkly 4.2.0 filesystem, shell, environment +74 18.7 MB checkly-engineering
env-cmd 10.1.0 filesystem, environment +0 46.1 kB toddbluhm
dotenv-cli 6.0.0 environment +0 8.19 kB entropitor
tsconfig-paths 4.2.0 None +0 216 kB jonaskello
prettier-plugin-tailwindcss 0.2.5 filesystem, environment +0 718 kB thecrypticace

@hariombalhara hariombalhara changed the title support embedding org profile page fix: Support embedding org profile page Oct 27, 2023
@deploysentinel
Copy link

deploysentinel bot commented Oct 27, 2023

Current Playwright Test Results Summary

✅ 222 Passing - ⚠️ 19 Flaky

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

(Last updated on 10/30/2023 11:07:37am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 7f90b90

Started: 10/30/2023 11:03:26am UTC

⚠️ Flakes

📄   apps/web/playwright/locale.e2e.ts • 13 Flakes

Top 1 Common Error Messages

null

13 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
unauthorized user sees correct translations (de) should use correct translations and html attributes
Retry 1Initial Attempt
-11.68% (-32) -32 / 274 runs
failed over last 7 days
11.68% (32) 32 / 274 runs
flaked over last 7 days
unauthorized user sees correct translations (ar) should use correct translations and html attributes
Retry 1Initial Attempt
-11.68% (-32) -32 / 274 runs
failed over last 7 days
11.68% (32) 32 / 274 runs
flaked over last 7 days
unauthorized user sees correct translations (zh) should use correct translations and html attributes
Retry 1Initial Attempt
-11.68% (-32) -32 / 274 runs
failed over last 7 days
11.68% (32) 32 / 274 runs
flaked over last 7 days
unauthorized user sees correct translations (zh-CN) should use correct translations and html attributes
Retry 1Initial Attempt
-11.68% (-32) -32 / 274 runs
failed over last 7 days
11.68% (32) 32 / 274 runs
flaked over last 7 days
unauthorized user sees correct translations (zh-TW) should use correct translations and html attributes
Retry 1Initial Attempt
-11.31% (-31) -31 / 274 runs
failed over last 7 days
11.68% (32) 32 / 274 runs
flaked over last 7 days
unauthorized user sees correct translations (pt) should use correct translations and html attributes
Retry 1Initial Attempt
-11.72% (-32) -32 / 273 runs
failed over last 7 days
11.72% (32) 32 / 273 runs
flaked over last 7 days
unauthorized user sees correct translations (pt-br) should use correct translations and html attributes
Retry 1Initial Attempt
-11.72% (-32) -32 / 273 runs
failed over last 7 days
11.72% (32) 32 / 273 runs
flaked over last 7 days
unauthorized user sees correct translations (es-419) should use correct translations and html attributes
Retry 1Initial Attempt
-11.36% (-31) -31 / 273 runs
failed over last 7 days
11.72% (32) 32 / 273 runs
flaked over last 7 days
authorized user sees correct translations (de) should return correct translations and html attributes
Retry 1Initial Attempt
-10.33% (-28) -28 / 271 runs
failed over last 7 days
11.81% (32) 32 / 271 runs
flaked over last 7 days
authorized user sees correct translations (pt-br) should return correct translations and html attributes
Retry 1Initial Attempt
-9.74% (-26) -26 / 267 runs
failed over last 7 days
11.99% (32) 32 / 267 runs
flaked over last 7 days
authorized user sees correct translations (ar) should return correct translations and html attributes
Retry 1Initial Attempt
-11.49% (-30) -30 / 261 runs
failed over last 7 days
12.26% (32) 32 / 261 runs
flaked over last 7 days
authorized user sees changed translations (de->ar) should return correct translations and html attributes
Retry 1Initial Attempt
-8.88% (-23) -23 / 259 runs
failed over last 7 days
11.58% (30) 30 / 259 runs
flaked over last 7 days
authorized user sees changed translations (de->pt-BR) [locale1] should return correct translations and html attributes
Retry 1Initial Attempt
-7.94% (-20) -20 / 252 runs
failed over last 7 days
11.11% (28) 28 / 252 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 Can book a paid booking
Retry 1Initial Attempt
3.13% (9) 9 / 288 runs
failed over last 7 days
4.86% (14) 14 / 288 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 should be able to reschedule
Retry 2Retry 1Initial Attempt
14.38% (42) 42 / 292 runs
failed over last 7 days
83.56% (244) 244 / 292 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 1Initial Attempt
3.09% (9) 9 / 291 runs
failed over last 7 days
54.30% (158) 158 / 291 runs
flaked over last 7 days

📄   apps/web/playwright/oauth-provider.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
OAuth Provider redirect not logged-in users to login page and after forward to authorization page
Retry 1Initial Attempt
0% (0) 0 / 286 runs
failed over last 7 days
1.75% (5) 5 / 286 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 Non admin team members cannot create team in org
Retry 1Initial Attempt
0% (0) 0 / 55 runs
failed over last 7 days
20% (11) 11 / 55 runs
flaked over last 7 days

📄   packages/app-store/routing-forms/playwright/tests/basic.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Routing Forms Seeded Routing Form Routing Link should validate fields
Retry 1Initial Attempt
0.35% (1) 1 / 286 run
failed over last 7 days
12.94% (37) 37 / 286 runs
flaked over last 7 days

View Detailed Build Results


@github-actions
Copy link
Contributor

github-actions bot commented Oct 27, 2023

📦 Next.js Bundle Analysis for @calcom/web

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

New Page Added

The following page was added to the bundle from the code in this PR:

Page Size (compressed) First Load % of Budget (350 KB)
/org/[orgSlug]/embed 219.69 KB 375.79 KB 107.37%

Copy link
Contributor

@Udit-takkar Udit-takkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@hariombalhara hariombalhara merged commit 9e3465e into main Oct 30, 2023
@hariombalhara hariombalhara deleted the Support_embedding_org_profile_page branch October 30, 2023 12:19
hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Nov 28, 2023
* support embedding org profile page

* Add checkly tests

* Fix test titles

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023
* support embedding org profile page

* Add checkly tests

* Fix test titles

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
zomars pushed a commit that referenced this pull request Jan 29, 2024
* support embedding org profile page

* Add checkly tests

* Fix test titles

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core area: core, team members only High priority Created by Linear-GitHub Sync organizations area: organizations, orgs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-2643] Org booking homepage is not embeddable
3 participants