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: Use origin as provided in HeadSeo. origin would be different for Domain cases #14935

Merged
merged 15 commits into from
May 23, 2024

Conversation

hariombalhara
Copy link
Member

@hariombalhara hariombalhara commented May 8, 2024

What does this PR do?

Fixes #14936
Fixes CAL-3661

Fixes the origin for Cal.com used in SEO. It fixes two things automatically

  1. Canonical
  2. og:url

Tests

  1. Added various involved components' unit tests
  2. Added an e2e as well for org and non-org scenario

Screenshots for the branch

Profile Page - Team
image

Profile Page - User
image

Event Page(BookerSeo)
image

For a non-org event it is same as earlier
image

Type of change

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

How should this be tested?

  • Simply view the source-code for Profile Pages and Event Type(Booker) pages for Team and User events in an org

Mandatory Tasks

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

Copy link

vercel bot commented May 8, 2024

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

3 Ignored Deployments
Name Status Preview Comments Updated (UTC)
ai ⬜️ Ignored (Inspect) Visit Preview May 22, 2024 9:18am
cal ⬜️ Ignored (Inspect) Visit Preview May 22, 2024 9:18am
calcom-web-canary ⬜️ Ignored (Inspect) Visit Preview May 22, 2024 9:18am

Copy link
Contributor

github-actions bot commented May 8, 2024

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

Copy link
Member Author

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

Join @hariombalhara and the rest of your teammates on Graphite Graphite

Copy link
Contributor

github-actions bot commented May 8, 2024

📦 Next.js Bundle Analysis for @calcom/web

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

Four Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load % of Budget (350 KB)
/[user] 114.63 KB 343.17 KB 98.05% (🟡 +2.09%)
/[user]/embed 114.63 KB 343.18 KB 98.05% (🟡 +2.10%)
/booking/[uid] 233.23 KB 461.78 KB 131.94% (🟡 +2.01%)
/booking/[uid]/embed 233.24 KB 461.78 KB 131.94% (🟡 +2.01%)
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

The "Budget %" column shows what percentage of your performance budget the First Load total takes up. For example, if your budget was 100kb, and a given page's first load size was 10kb, it would be 10% of your budget. You can also see how much this has increased or decreased compared to the base branch of your PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this. If you see "+/- <0.01%" it means that there was a change in bundle size, but it is a trivial enough amount that it can be ignored.

Copy link

linear bot commented May 8, 2024

Copy link

deploysentinel bot commented May 8, 2024

Current Playwright Test Results Summary

✅ 322 Passing - ⚠️ 20 Flaky

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

(Last updated on 05/22/2024 09:34:35am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: ce4bd5c

Started: 05/22/2024 09:29:45am UTC

⚠️ Flakes

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Insights should test download button
Retry 1Initial Attempt
0.46% (1) 1 / 219 run
failed over last 7 days
2.28% (5) 5 / 219 runs
flaked over last 7 days

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Users can impersonate App Admin can impersonate users with impersonation enabled
Retry 2Retry 1Initial Attempt
2.23% (5) 5 / 224 runs
failed over last 7 days
14.73% (33) 33 / 224 runs
flaked over last 7 days

📄   apps/web/playwright/event-types.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
Event Types tests -- future user Different Locations Tests Can add Link Meeting as location and book with it
Retry 1Initial Attempt
0% (0) 0 / 227 runs
failed over last 7 days
16.30% (37) 37 / 227 runs
flaked over last 7 days
Event Types tests -- future user Different Locations Tests Can remove location from multiple locations that are saved
Retry 1Initial Attempt
3.98% (9) 9 / 226 runs
failed over last 7 days
5.75% (13) 13 / 226 runs
flaked over last 7 days

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

Top 1 Common Error Messages

null

9 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 1Initial Attempt
2.27% (5) 5 / 220 runs
failed over last 7 days
57.73% (127) 127 / 220 runs
flaked over last 7 days
Popup Tests should be able to reschedule
Retry 1Initial Attempt
-144.32% (-127) -127 / 88 runs
failed over last 7 days
144.32% (127) 127 / 88 runs
flaked over last 7 days
Popup Tests should open Routing Forms embed on click
Retry 1Initial Attempt
-144.32% (-127) -127 / 88 runs
failed over last 7 days
144.32% (127) 127 / 88 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
-143.18% (-126) -126 / 88 runs
failed over last 7 days
144.32% (127) 127 / 88 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 1Initial Attempt
-144.83% (-126) -126 / 87 runs
failed over last 7 days
144.83% (126) 126 / 87 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 1Initial Attempt
-144.83% (-126) -126 / 87 runs
failed over last 7 days
144.83% (126) 126 / 87 runs
flaked over last 7 days
Popup Tests prendered embed should be loaded and apply the config given to it
Retry 1Initial Attempt
-144.83% (-126) -126 / 87 runs
failed over last 7 days
144.83% (126) 126 / 87 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 1Initial Attempt
-144.83% (-126) -126 / 87 runs
failed over last 7 days
144.83% (126) 126 / 87 runs
flaked over last 7 days
Popup Tests should open on clicking child element
Retry 1Initial Attempt
-142.53% (-124) -124 / 87 runs
failed over last 7 days
142.53% (124) 124 / 87 runs
flaked over last 7 days

📄   packages/embeds/embed-core/playwright/tests/namespacing.e2e.ts • 4 Flakes

Top 1 Common Error Messages

null

4 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Namespacing Inline Embed Add inline embed using a namespace without reload
Retry 1Initial Attempt
0% (0) 0 / 220 runs
failed over last 7 days
65.45% (144) 144 / 220 runs
flaked over last 7 days
Namespacing Inline Embed Double install Embed Snippet with inline embed using a namespace
Retry 1Initial Attempt
0.45% (1) 1 / 220 run
failed over last 7 days
63.64% (140) 140 / 220 runs
flaked over last 7 days
Namespacing Inline Embed Double install Embed Snippet with inline embed without a namespace(i.e. default namespace)
Retry 1Initial Attempt
0% (0) 0 / 220 runs
failed over last 7 days
65.45% (144) 144 / 220 runs
flaked over last 7 days
Namespacing Different namespaces can have different init configs
Retry 1Initial Attempt
0% (0) 0 / 220 runs
failed over last 7 days
62.27% (137) 137 / 220 runs
flaked over last 7 days

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
user can login & logout succesfully -- future login flow user & logout using dashboard
Retry 1Initial Attempt
3.54% (8) 8 / 226 runs
failed over last 7 days
31.86% (72) 72 / 226 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 -- legacy Can create a booking for Round Robin EventType
Retry 1Initial Attempt
8.09% (19) 19 / 235 runs
failed over last 7 days
31.91% (75) 75 / 235 runs
flaked over last 7 days

📄   packages/embeds/embed-react/playwright/tests/basic.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
React Embed Element Click Popup should verify that the iframe got created with correct URL - namespaced
Retry 1Initial Attempt
20.33% (49) 49 / 241 runs
failed over last 7 days
35.68% (86) 86 / 241 runs
flaked over last 7 days

View Detailed Build Results


@dosubot dosubot bot added this to the v4.2 milestone May 15, 2024
@github-actions github-actions bot added High priority Created by Linear-GitHub Sync organizations area: organizations, orgs 🐛 bug Something isn't working labels May 17, 2024
@dosubot dosubot bot added teams area: teams, round robin, collective, managed event-types ui area: UI, frontend, button, form, input labels May 21, 2024
@graphite-app graphite-app bot requested a review from a team May 21, 2024 09:11
Copy link

graphite-app bot commented May 21, 2024

Graphite Automations

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

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

Copy link
Member

@sean-brydon sean-brydon left a comment

Choose a reason for hiding this comment

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

LGTM - tested and seems like its working!

Nice job with the tests <3

@sean-brydon sean-brydon merged commit 5f5cf92 into main May 23, 2024
42 checks passed
@sean-brydon sean-brydon deleted the fix-seo-origin branch May 23, 2024 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bookings area: bookings, availability, timezones, double booking 🐛 bug Something isn't working consumer core area: core, team members only High priority Created by Linear-GitHub Sync organizations area: organizations, orgs teams area: teams, round robin, collective, managed event-types ui area: UI, frontend, button, form, input
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-3661] Wrong canonical link in source for org events
3 participants