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

chore: remove personal branding if in an org and use org branding #14872

Merged
merged 15 commits into from
Jul 4, 2024

Conversation

anikdhabal
Copy link
Contributor

@anikdhabal anikdhabal commented May 3, 2024

What does this PR do?

Fixes #14090
Screenshot 2024-05-04 002125
Screenshot 2024-05-04 002100

Copy link

vercel bot commented May 3, 2024

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

A member of the Team first needs to authorize it.

@graphite-app graphite-app bot added the community Created by Linear-GitHub Sync label May 3, 2024
@graphite-app graphite-app bot requested a review from a team May 3, 2024 18:50
Copy link
Contributor

github-actions bot commented May 3, 2024

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

@github-actions github-actions bot added enterprise area: enterprise, audit log, organisation, SAML, SSO Medium priority Created by Linear-GitHub Sync organizations area: organizations, orgs ui area: UI, frontend, button, form, input ✨ feature New feature or request 🧹 Improvements Improvements to existing features. Mostly UX/UI labels May 3, 2024
Copy link

graphite-app bot commented May 3, 2024

Graphite Automations

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

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

@dosubot dosubot bot added the 🐛 bug Something isn't working label May 3, 2024
Copy link
Contributor

github-actions bot commented May 3, 2024

📦 Next.js Bundle Analysis for @calcom/web

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

Seventy-eight 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)
/apps 279.87 KB 507.54 KB 145.01% (🟢 -1.23%)
/apps/[slug] 297.45 KB 525.13 KB 150.04% (🟢 -1.24%)
/apps/[slug]/[...pages] 588.52 KB 816.19 KB 233.20% (🟢 -1.18%)
/apps/categories 256.22 KB 483.89 KB 138.26% (🟢 -1.24%)
/apps/categories/[category] 261.97 KB 489.65 KB 139.90% (🟢 -1.24%)
/apps/installed/[category] 278.32 KB 505.99 KB 144.57% (🟢 -1.79%)
/auth/saml-idp 12.22 KB 239.9 KB 68.54% (🟢 -20.80%)
/availability 426.12 KB 653.79 KB 186.80% (🟢 -1.80%)
/availability/[schedule] 410.54 KB 638.21 KB 182.35% (🟢 -1.66%)
/bookings/[status] 325.9 KB 553.58 KB 158.16% (🟢 -1.22%)
/enterprise 256.27 KB 483.95 KB 138.27% (🟢 -1.23%)
/event-types 561.23 KB 788.9 KB 225.40% (🟢 -1.18%)
/event-types/[type] 437.42 KB 665.1 KB 190.03% (🟢 -1.17%)
/insights 474.63 KB 702.31 KB 200.66% (🟢 -1.69%)
/more 255.78 KB 483.46 KB 138.13% (🟢 -1.23%)
/settings/admin 262.22 KB 489.89 KB 139.97% (🟢 -1.22%)
/settings/admin/apps 275.46 KB 503.13 KB 143.75% (🟢 -1.25%)
/settings/admin/apps/[category] 275.44 KB 503.12 KB 143.75% (🟢 -1.25%)
/settings/admin/flags 265.94 KB 493.62 KB 141.03% (🟢 -1.25%)
/settings/admin/impersonation 262.61 KB 490.29 KB 140.08% (🟢 -1.22%)
/settings/admin/lockedSMS 283.65 KB 511.32 KB 146.09% (🟢 -1.21%)
/settings/admin/oAuth 274.21 KB 501.89 KB 143.40% (🟢 -1.25%)
/settings/admin/orgMigrations/_OrgMigrationLayout 251.15 KB 478.82 KB 136.81% (🟢 -1.23%)
/settings/admin/orgMigrations/moveTeamToOrg 300.88 KB 528.56 KB 151.02% (🟢 -1.21%)
/settings/admin/orgMigrations/moveUserToOrg 320.66 KB 548.33 KB 156.67% (🟢 -1.20%)
/settings/admin/orgMigrations/removeTeamFromOrg 300.65 KB 528.32 KB 150.95% (🟢 -1.21%)
/settings/admin/orgMigrations/removeUserFromOrg 300.66 KB 528.33 KB 150.95% (🟢 -1.20%)
/settings/admin/organizations 264.1 KB 491.78 KB 140.51% (🟢 -1.22%)
/settings/admin/organizations/[id]/edit 262.77 KB 490.44 KB 140.13% (🟢 -1.23%)
/settings/admin/users 264.88 KB 492.55 KB 140.73% (🟢 -1.22%)
/settings/admin/users/[id]/edit 393.93 KB 621.61 KB 177.60% (🟢 -1.22%)
/settings/admin/users/add 393.6 KB 621.28 KB 177.51% (🟢 -1.23%)
/settings/billing 262.42 KB 490.1 KB 140.03% (🟢 -1.22%)
/settings/developer/api-keys 266.71 KB 494.38 KB 141.25% (🟢 -1.25%)
/settings/developer/webhooks 266.88 KB 494.55 KB 141.30% (🟢 -1.25%)
/settings/developer/webhooks/[id] 267.83 KB 495.5 KB 141.57% (🟢 -1.24%)
/settings/developer/webhooks/new 267.86 KB 495.53 KB 141.58% (🟢 -1.24%)
/settings/my-account/appearance 314.31 KB 541.98 KB 154.85% (🟢 -1.53%)
/settings/my-account/calendars 274.34 KB 502.01 KB 143.43% (🟢 -1.11%)
/settings/my-account/conferencing 272.32 KB 499.99 KB 142.85% (🟢 -1.95%)
/settings/my-account/general 377.82 KB 605.5 KB 173.00% (🟢 -1.24%)
/settings/my-account/out-of-office 267.35 KB 495.02 KB 141.43% (🟢 -1.25%)
/settings/my-account/profile 410.27 KB 637.95 KB 182.27% (🟢 -1.24%)
/settings/organizations/[id]/about 159.65 KB 387.33 KB 110.66% (🟡 +0.47%)
/settings/organizations/[id]/add-teams 159.64 KB 387.32 KB 110.66% (🟡 +0.47%)
/settings/organizations/admin-api 262.38 KB 490.05 KB 140.01% (🟢 -1.22%)
/settings/organizations/appearance 122.31 KB 349.98 KB 99.99% (🟢 -48.03%)
/settings/organizations/billing 262.46 KB 490.13 KB 140.04% (🟢 -1.22%)
/settings/organizations/dsync 295.08 KB 522.76 KB 149.36% (🟢 -1.22%)
/settings/organizations/general 350.67 KB 578.34 KB 165.24% (🟢 -1.24%)
/settings/organizations/members 400.49 KB 628.16 KB 179.47% (🟢 -1.62%)
/settings/organizations/new 159.66 KB 387.33 KB 110.67% (🟡 +0.46%)
/settings/organizations/privacy 267.87 KB 495.54 KB 141.58% (🟢 -1.25%)
/settings/organizations/profile 415.14 KB 642.81 KB 183.66% (🟡 +2.29%)
/settings/organizations/sso 273.05 KB 500.72 KB 143.06% (🟢 -1.22%)
/settings/organizations/teams/other 263.29 KB 490.96 KB 140.28% (🟢 -1.23%)
/settings/organizations/teams/other/[id]/appearance 275.09 KB 502.77 KB 143.65% (🟢 -1.20%)
/settings/organizations/teams/other/[id]/members 269.78 KB 497.46 KB 142.13% (🟢 -1.25%)
/settings/organizations/teams/other/[id]/profile 473.5 KB 701.17 KB 200.33% (🟢 -1.24%)
/settings/platform 260.88 KB 488.56 KB 139.59% (🟢 -1.24%)
/settings/platform/new 120.67 KB 348.34 KB 99.53% (🟡 +0.50%)
/settings/platform/oauth-clients/[clientId]/edit 259.19 KB 486.86 KB 139.10% (🟢 -1.23%)
/settings/platform/oauth-clients/create 258.33 KB 486 KB 138.86% (🟢 -1.24%)
/settings/security/impersonation 267.52 KB 495.2 KB 141.49% (🟢 -1.26%)
/settings/security/password 305.68 KB 533.35 KB 152.39% (🟢 -1.24%)
/settings/security/sso 272.5 KB 500.17 KB 142.91% (🟢 -1.22%)
/settings/security/two-factor-auth 271.01 KB 498.68 KB 142.48% (🟢 -1.25%)
/settings/teams 261.96 KB 489.63 KB 139.89% (🟢 -1.22%)
/settings/teams/[id]/appearance 275.08 KB 502.75 KB 143.64% (🟢 -1.20%)
/settings/teams/[id]/billing 262.46 KB 490.14 KB 140.04% (🟢 -1.22%)
/settings/teams/[id]/members 379.9 KB 607.57 KB 173.59% (🟢 -1.24%)
/settings/teams/[id]/profile 474.28 KB 701.95 KB 200.56% (🟢 -1.25%)
/settings/teams/new 193.06 KB 420.73 KB 120.21% (🟢 -1.81%)
/teams 256.01 KB 483.68 KB 138.20% (🟢 -1.24%)
/upgrade 256.13 KB 483.8 KB 138.23% (🟢 -1.24%)
/video/[uid] 291.18 KB 518.85 KB 148.24% (🟢 -0.18%)
/workflows 287.88 KB 515.55 KB 147.30% (🟢 -1.22%)
/workflows/[workflow] 413.8 KB 641.48 KB 183.28% (🟢 -1.68%)
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.

@keithwillcode keithwillcode added this to the v4.1 milestone May 8, 2024
@anikdhabal anikdhabal requested a review from Udit-takkar May 8, 2024 16:13
@dosubot dosubot bot modified the milestone: v4.1 May 9, 2024
@dosubot dosubot bot modified the milestone: v4.1 May 15, 2024
@PeerRich PeerRich added this pull request to the merge queue Jun 11, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 11, 2024
@CarinaWolli CarinaWolli added this pull request to the merge queue Jun 11, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jun 11, 2024
…4872)

* chore: remove personal branding if in an org and use org branding

* fix: minor fix

* Update SettingsLayout.tsx

* Update SettingsLayout.tsx

* Update profile.tsx

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 11, 2024
Copy link
Member

@CarinaWolli CarinaWolli left a comment

Choose a reason for hiding this comment

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

e2e test in upload-avatar.e2e.ts is failing

@anikdhabal
Copy link
Contributor Author

e2e test in upload-avatar.e2e.ts is failing

Thanks @CarinaWolli for the review. I will fix that shortly.

@keithwillcode keithwillcode modified the milestones: v4.2, v4.3 Jun 17, 2024
@dosubot dosubot bot modified the milestone: v4.3 Jun 17, 2024
@CarinaWolli
Copy link
Member

it can upload a organization logo image in upload-avatar.e2e.ts is still failing for me 🤔

@keithwillcode keithwillcode added the community-interns The team responsible for reviewing, testing and shipping low/medium community PRs label Jun 28, 2024
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.

I have fixed the E2E test but there is also an open issue to change the UI of banner uploader #15456

@anikdhabal
Copy link
Contributor Author

anikdhabal commented Jul 4, 2024

I have fixed the E2E test but there is also an open issue to change the UI of banner uploader #15456

Hey Udit, thanks for it. I've gone through his PR, and he completely created the OrgBanner component and imported and used it in the profile. So after this merge, it won't be tough to update the code. He just needs to import and use it in different profile components.

@Udit-takkar Udit-takkar merged commit 7d06d9f into calcom:main Jul 4, 2024
29 of 37 checks passed
p6l-richard pushed a commit to p6l-richard/cal.com-fork that referenced this pull request Jul 22, 2024
…lcom#14872)

* chore: remove personal branding if in an org and use org branding

* fix: minor fix

* Update SettingsLayout.tsx

* Update SettingsLayout.tsx

* Update profile.tsx

* some fixes and e2e test

* fix: e2e test

---------

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit222001@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐛 bug Something isn't working community Created by Linear-GitHub Sync community-interns The team responsible for reviewing, testing and shipping low/medium community PRs enterprise area: enterprise, audit log, organisation, SAML, SSO ✨ feature New feature or request 🧹 Improvements Improvements to existing features. Mostly UX/UI Medium priority Created by Linear-GitHub Sync organizations area: organizations, orgs ready-for-e2e ui area: UI, frontend, button, form, input
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-3398] remove personal branding if you are in an org and use org branding
4 participants