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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from

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. 🤖

Seventeen 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)
/settings/admin/organizations 264.41 KB 493.05 KB 140.87% (🟡 +0.16%)
/settings/admin/users 265.18 KB 493.82 KB 141.09% (🟡 +0.18%)
/settings/developer/api-keys 267.12 KB 495.76 KB 141.65% (🟡 +0.18%)
/settings/developer/webhooks 267.26 KB 495.9 KB 141.69% (🟡 +0.20%)
/settings/developer/webhooks/[id] 268.19 KB 496.84 KB 141.95% (🟡 +0.18%)
/settings/developer/webhooks/new 268.22 KB 496.87 KB 141.96% (🟡 +0.19%)
/settings/my-account/calendars 273.75 KB 502.39 KB 143.54% (🟡 +0.22%)
/settings/my-account/out-of-office 267.75 KB 496.39 KB 141.83% (🟡 +0.18%)
/settings/organizations/appearance 121.68 KB 350.32 KB 100.09% (🟢 -47.05%)
/settings/organizations/dsync 295.38 KB 524.02 KB 149.72% (🟡 +0.23%)
/settings/organizations/general 350.86 KB 579.5 KB 165.57% (🟡 +0.20%)
/settings/organizations/members 400.66 KB 629.31 KB 179.80% (🟡 +0.21%)
/settings/organizations/profile 409.72 KB 638.36 KB 182.39% (🟡 +3.21%)
/settings/organizations/teams/other 263.59 KB 492.23 KB 140.64% (🟡 +0.15%)
/settings/security/impersonation 267.92 KB 496.56 KB 141.88% (🟡 +0.17%)
/settings/security/password 305.55 KB 534.19 KB 152.63% (🟡 +0.19%)
/settings/security/two-factor-auth 271.39 KB 500.03 KB 142.87% (🟡 +0.18%)
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.

Comment on lines +435 to +439
const session = useSession();
const router = useRouter();
if (!!session.data?.user?.org?.id) {
router.replace("/settings/organizations/profile");
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should just hide the tab instead of doing this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey Udit, I already hide this tab in the settings layout. We added it because if a user tries to access the page using the link, then we redirect them to the profile page.

Comment on lines -82 to -87
<LicenseRequired>
<Meta
title={t("appearance")}
description={t("appearance_org_description")}
borderInShellHeader={false}
/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did you remove LicenseRequired and Meta ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We used the component in the profile section, where LicenseRequired and Meta were already used as parents.

@@ -27,7 +24,6 @@ type BrandColorsFormValues = {

const OrgAppearanceView = ({
currentOrg,
isAdminOrOwner,
Copy link
Contributor

Choose a reason for hiding this comment

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

Only admin or owner should be able to change organization's appearance settings.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We handle it in the profile section. Do we need to check each one individually?

@keithwillcode keithwillcode added this to the v4.1 milestone May 8, 2024
@dosubot dosubot bot modified the milestone: v4.1 May 9, 2024
@dosubot dosubot bot modified the milestone: v4.1 May 15, 2024
@dosubot dosubot bot added this to the v4.2 milestone May 15, 2024
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 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 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
3 participants