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

Add the new Team->useHostDefault option #7811

Merged
merged 10 commits into from
Mar 28, 2023

Conversation

emrysal
Copy link
Contributor

@emrysal emrysal commented Mar 17, 2023

What does this PR do?

Adds a new "Use organiser default conferencing app" intended at falling through and using the organizerUser default conferencing app. Only shows for team events.

image

@emrysal emrysal requested a review from zomars as a code owner March 17, 2023 21:51
@emrysal emrysal requested review from a team March 17, 2023 21:51
@vercel
Copy link

vercel bot commented Mar 17, 2023

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

Name Status Preview Comments Updated
cal ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Mar 28, 2023 at 7:51PM (UTC)
dhe ❌ Failed (Inspect) Mar 28, 2023 at 7:51PM (UTC)
ui ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Mar 28, 2023 at 7:51PM (UTC)

@github-actions
Copy link
Contributor

github-actions bot commented Mar 17, 2023

📦 Next.js Bundle Analysis

This analysis was generated by the next.js bundle analysis action 🤖

⚠️ Global Bundle Size Increased

Page Size (compressed)
global 233.32 KB (🟡 +1 B)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

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

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Sixty-six 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)
/404 8.36 KB 241.68 KB 69.05% (+/- <0.01%)
/[user] 70.21 KB 303.52 KB 86.72% (🟡 +0.02%)
/[user]/[type] 91.94 KB 325.26 KB 92.93% (🟡 +0.03%)
/[user]/[type]/embed 91.97 KB 325.29 KB 92.94% (🟡 +0.02%)
/[user]/book 183.54 KB 416.86 KB 119.10% (🟡 +0.03%)
/[user]/embed 70.27 KB 303.59 KB 86.74% (🟡 +0.01%)
/apps 167.17 KB 400.49 KB 114.43% (+/- <0.01%)
/apps/[slug] 190.89 KB 424.21 KB 121.20% (+/- <0.01%)
/apps/[slug]/[...pages] 392.3 KB 625.62 KB 178.75% (+/- <0.01%)
/apps/categories 152.07 KB 385.39 KB 110.11% (+/- <0.01%)
/apps/categories/[category] 155.94 KB 389.26 KB 111.22% (+/- <0.01%)
/apps/installed/[category] 197.09 KB 430.41 KB 122.97% (🟡 +0.02%)
/auth/error 19.24 KB 252.56 KB 72.16% (+/- <0.01%)
/auth/forgot-password 25.63 KB 258.95 KB 73.99% (🟢 -0.01%)
/auth/forgot-password/[id] 32.83 KB 266.15 KB 76.04% (+/- <0.01%)
/auth/login 40.1 KB 273.42 KB 78.12% (+/- <0.01%)
/auth/logout 7.56 KB 240.88 KB 68.82% (+/- <0.01%)
/availability 155.38 KB 388.7 KB 111.06% (+/- <0.01%)
/availability/[schedule] 272.14 KB 505.46 KB 144.42% (+/- <0.01%)
/availability/troubleshoot 152.76 KB 386.08 KB 110.31% (+/- <0.01%)
/booking/[uid] 123.62 KB 356.94 KB 101.98% (🟡 +0.02%)
/bookings/[status] 272.46 KB 505.78 KB 144.51% (🟡 +0.02%)
/d/[link]/[slug] 91.59 KB 324.91 KB 92.83% (🟡 +0.03%)
/d/[link]/[slug]/embed 91.62 KB 324.94 KB 92.84% (🟡 +0.02%)
/d/[link]/book 183.2 KB 416.51 KB 119.00% (🟡 +0.03%)
/event-types/[type] 382.94 KB 616.26 KB 176.07% (🟡 +0.04%)
/insights 386.24 KB 619.56 KB 177.02% (+/- <0.01%)
/more 151.7 KB 385.01 KB 110.00% (+/- <0.01%)
/payment/[uid] 60.86 KB 294.17 KB 84.05% (🟡 +0.01%)
/settings/admin 157.15 KB 390.47 KB 111.56% (+/- <0.01%)
/settings/admin/apps 165.84 KB 399.16 KB 114.04% (+/- <0.01%)
/settings/admin/apps/[category] 165.82 KB 399.14 KB 114.04% (+/- <0.01%)
/settings/admin/flags 160.05 KB 393.36 KB 112.39% (+/- <0.01%)
/settings/admin/impersonation 157.44 KB 390.75 KB 111.64% (+/- <0.01%)
/settings/billing 157.27 KB 390.58 KB 111.60% (🟢 -0.01%)
/settings/developer/api-keys 186.42 KB 419.74 KB 119.92% (+/- <0.01%)
/settings/developer/webhooks 159.76 KB 393.07 KB 112.31% (+/- <0.01%)
/settings/developer/webhooks/[id] 190.61 KB 423.93 KB 121.12% (+/- <0.01%)
/settings/developer/webhooks/new 190.47 KB 423.79 KB 121.08% (+/- <0.01%)
/settings/my-account/appearance 171.23 KB 404.55 KB 115.58% (+/- <0.01%)
/settings/my-account/calendars 191.45 KB 424.77 KB 121.36% (+/- <0.01%)
/settings/my-account/conferencing 163.08 KB 396.39 KB 113.26% (🟡 +0.01%)
/settings/my-account/general 266.42 KB 499.74 KB 142.78% (+/- <0.01%)
/settings/my-account/profile 274.24 KB 507.56 KB 145.02% (+/- <0.01%)
/settings/security/impersonation 159.31 KB 392.62 KB 112.18% (+/- <0.01%)
/settings/security/password 192.6 KB 425.92 KB 121.69% (+/- <0.01%)
/settings/security/sso 167 KB 400.32 KB 114.38% (+/- <0.01%)
/settings/security/two-factor-auth 161.76 KB 395.08 KB 112.88% (+/- <0.01%)
/settings/teams 156.9 KB 390.22 KB 111.49% (+/- <0.01%)
/settings/teams/[id]/appearance 171.25 KB 404.57 KB 115.59% (+/- <0.01%)
/settings/teams/[id]/billing 157.13 KB 390.45 KB 111.56% (+/- <0.01%)
/settings/teams/[id]/members 297.14 KB 530.46 KB 151.56% (+/- <0.01%)
/settings/teams/[id]/profile 269.45 KB 502.77 KB 143.65% (+/- <0.01%)
/settings/teams/[id]/sso 167.09 KB 400.41 KB 114.40% (+/- <0.01%)
/signup 25.5 KB 258.81 KB 73.95% (+/- <0.01%)
/team/[slug] 72.62 KB 305.93 KB 87.41% (+/- <0.01%)
/team/[slug]/[type] 91.59 KB 324.91 KB 92.83% (🟡 +0.03%)
/team/[slug]/[type]/embed 91.63 KB 324.94 KB 92.84% (🟡 +0.03%)
/team/[slug]/book 183.2 KB 416.52 KB 119.00% (🟡 +0.03%)
/team/[slug]/embed 72.68 KB 306 KB 87.43% (+/- <0.01%)
/teams 151.92 KB 385.23 KB 110.07% (+/- <0.01%)
/video/meeting-ended/[uid] 14.67 KB 247.98 KB 70.85% (+/- <0.01%)
/video/meeting-not-started/[uid] 14.3 KB 247.62 KB 70.75% (+/- <0.01%)
/video/no-meeting-found 6.6 KB 239.92 KB 68.55% (+/- <0.01%)
/workflows 164.81 KB 398.13 KB 113.75% (+/- <0.01%)
/workflows/[workflow] 294.03 KB 527.34 KB 150.67% (+/- <0.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.

@deploysentinel
Copy link

deploysentinel bot commented Mar 17, 2023

Current Playwright Test Results Summary

✅ 65 Passing - ❌ 1 Failing

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

(Last updated on 03/28/2023 08:03:13pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 2e7e311

Started: 03/28/2023 07:56:26pm UTC

❌ Failures

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Routing Forms Seeded Routing Form Routing Link - Reporting and CSV Download
Retry 2Retry 1Initial Attempt
Error: Test timeout of 120000ms exceeded.
Test timeout of 120000ms exceeded.
4.97% (8) 8 / 161 runs
failed over last 7 days
29.19% (47) 47 / 161 runs
flaked over last 7 days

View Detailed Build Results


@ciaranha
Copy link
Member

@emrysal can we change the label to "Organizer's default app" and have it under the mini title of "Conferencing" instead of "Team"?

We don't use the word "Use" for anything else and in terms of location it's a conferencing option, the fact that it's for a team is handled by our logic, not sure we need a title for it.

@emrysal
Copy link
Contributor Author

emrysal commented Mar 19, 2023

Implemented suggestions @Jaibles 🙏

@@ -8,54 +8,61 @@ import { FiLink } from "@calcom/ui/components/icon";

import type { Props } from "./pages/AvailabilityPage";

const excludeNullValues = (value: unknown) => !!value;

export function AvailableEventLocations({ locations }: { locations: Props["eventType"]["locations"] }) {
Copy link
Member

Choose a reason for hiding this comment

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

Organizer's default app is not shown as a location in the booking description. I have Google Meet and Organizer's default app set as locations:
Screenshot 2023-03-20 at 11 34 02

Everything else looks good to me 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I do this intentionally - Wouldn't make much sense to a booker to talk about organizers on a round robin event, e.g. Ideally we'd already know who you will be booked with at the booking stage but that's a future improvement 🙏

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.

NIT but LGTM

return null;
}

const translateAbleKeys = [
Copy link
Member

Choose a reason for hiding this comment

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

NIT

Suggested change
const translateAbleKeys = [
const translatableKeys = [

@PeerRich PeerRich enabled auto-merge (squash) March 28, 2023 19:52
@PeerRich PeerRich merged commit 72fd633 into main Mar 28, 2023
@PeerRich PeerRich deleted the feature/team-event-use-organizer-location-option branch March 28, 2023 20:03
@PeerRich PeerRich added the core area: core, team members only label Jul 24, 2023
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants