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: filter admin_api if org is present #15386

Merged
merged 4 commits into from
Jul 16, 2024
Merged

Conversation

Neon-20
Copy link
Contributor

@Neon-20 Neon-20 commented Jun 10, 2024

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

  • [✅] I have self-reviewed the code (A decent size PR without self-review might be rejected)
  • I have added a Docs issue here if this PR makes changes that would require a documentation change
  • I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)

@graphite-app graphite-app bot added the community Created by Linear-GitHub Sync label Jun 10, 2024
@graphite-app graphite-app bot requested a review from a team June 10, 2024 07:27
Copy link

vercel bot commented Jun 10, 2024

@Neon-20 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

Copy link
Contributor

github-actions bot commented Jun 10, 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 api area: API, enterprise API, access token, OAuth Low priority Created by Linear-GitHub Sync organizations area: organizations, orgs labels Jun 10, 2024
@dosubot dosubot bot added the 🐛 bug Something isn't working label Jun 10, 2024
@dosubot dosubot bot added this to the v4.3 milestone Jun 10, 2024
Copy link

graphite-app bot commented Jun 10, 2024

Graphite Automations

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

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

@dosubot dosubot bot modified the milestones: v4.3, v4.4 Jun 11, 2024
Copy link
Contributor

This PR is being marked as stale due to inactivity.

@github-actions github-actions bot added the Stale label Jun 26, 2024
Copy link
Contributor

@Amit91848 Amit91848 left a comment

Choose a reason for hiding this comment

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

Hey @Neon-20! I guess you misread the comment, we need to remove Admin API tab for /settings/developer and not /settings/organizations.

@github-actions github-actions bot removed the Stale label Jun 29, 2024
Copy link
Contributor

@Amit91848 Amit91848 left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Contributor

github-actions bot commented Jul 11, 2024

📦 Next.js Bundle Analysis for @calcom/web

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

Eighty 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 276.93 KB 504.55 KB 144.16% (🟢 -2.08%)
/apps/[slug] 294.49 KB 522.11 KB 149.17% (🟢 -2.08%)
/apps/[slug]/[...pages] 586.73 KB 814.35 KB 232.67% (🟢 -1.69%)
/apps/categories 254.24 KB 481.86 KB 137.67% (🟢 -1.80%)
/apps/categories/[category] 259.05 KB 486.67 KB 139.05% (🟢 -2.07%)
/apps/installation/[[...step]] 466.93 KB 694.55 KB 198.44% (🔴 +85.50%)
/apps/installed/[category] 278.17 KB 505.79 KB 144.51% (🟢 -1.83%)
/auth/saml-idp 12.22 KB 239.85 KB 68.53% (🟢 -20.80%)
/availability 426.34 KB 653.96 KB 186.85% (🟢 -1.74%)
/availability/[schedule] 410.25 KB 637.87 KB 182.25% (🟢 -1.74%)
/bookings/[status] 324.23 KB 551.85 KB 157.67% (🟢 -1.70%)
/enterprise 254.29 KB 481.92 KB 137.69% (🟢 -1.80%)
/event-types 559.39 KB 787.01 KB 224.86% (🟢 -1.71%)
/event-types/[type] 435.76 KB 663.38 KB 189.54% (🟢 -1.65%)
/getting-started/[[...step]] 447.92 KB 675.54 KB 193.01% (🟡 +10.66%)
/insights 474.24 KB 701.86 KB 200.53% (🟢 -1.80%)
/more 253.8 KB 481.42 KB 137.55% (🟢 -1.80%)
/settings/admin 260.27 KB 487.89 KB 139.40% (🟢 -1.78%)
/settings/admin/apps 273.64 KB 501.26 KB 143.22% (🟢 -1.77%)
/settings/admin/apps/[category] 273.62 KB 501.24 KB 143.21% (🟢 -1.77%)
/settings/admin/flags 264.1 KB 491.72 KB 140.49% (🟢 -1.78%)
/settings/admin/impersonation 260.66 KB 488.28 KB 139.51% (🟢 -1.78%)
/settings/admin/lockedSMS 281.75 KB 509.38 KB 145.54% (🟢 -1.75%)
/settings/admin/oAuth 272.38 KB 500 KB 142.86% (🟢 -1.77%)
/settings/admin/orgMigrations/_OrgMigrationLayout 249.2 KB 476.82 KB 136.23% (🟢 -1.77%)
/settings/admin/orgMigrations/moveTeamToOrg 298.96 KB 526.58 KB 150.45% (🟢 -1.76%)
/settings/admin/orgMigrations/moveUserToOrg 318.79 KB 546.41 KB 156.12% (🟢 -1.73%)
/settings/admin/orgMigrations/removeTeamFromOrg 298.72 KB 526.34 KB 150.38% (🟢 -1.75%)
/settings/admin/orgMigrations/removeUserFromOrg 298.73 KB 526.35 KB 150.39% (🟢 -1.76%)
/settings/admin/organizations 262.15 KB 489.78 KB 139.94% (🟢 -1.78%)
/settings/admin/organizations/[id]/edit 260.82 KB 488.44 KB 139.55% (🟢 -1.77%)
/settings/admin/users 262.92 KB 490.55 KB 140.16% (🟢 -1.78%)
/settings/admin/users/[id]/edit 392.11 KB 619.74 KB 177.07% (🟢 -1.75%)
/settings/admin/users/add 391.78 KB 619.4 KB 176.97% (🟢 -1.74%)
/settings/billing 260.47 KB 488.1 KB 139.46% (🟢 -1.78%)
/settings/developer/api-keys 264.87 KB 492.49 KB 140.71% (🟢 -1.78%)
/settings/developer/webhooks 265.04 KB 492.66 KB 140.76% (🟢 -1.78%)
/settings/developer/webhooks/[id] 266.02 KB 493.64 KB 141.04% (🟢 -1.76%)
/settings/developer/webhooks/new 266.05 KB 493.67 KB 141.05% (🟢 -1.76%)
/settings/my-account/appearance 313.47 KB 541.09 KB 154.60% (🟢 -1.78%)
/settings/my-account/calendars 271.89 KB 499.51 KB 142.72% (🟢 -1.82%)
/settings/my-account/conferencing 272.8 KB 500.42 KB 142.98% (🟢 -1.82%)
/settings/my-account/general 375.97 KB 603.6 KB 172.46% (🟢 -1.78%)
/settings/my-account/out-of-office 265.5 KB 493.12 KB 140.89% (🟢 -1.78%)
/settings/my-account/profile 408.41 KB 636.03 KB 181.72% (🟢 -1.77%)
/settings/organizations/[id]/about 159.66 KB 387.28 KB 110.65% (🟡 +0.47%)
/settings/organizations/[id]/add-teams 159.65 KB 387.27 KB 110.65% (🟡 +0.47%)
/settings/organizations/admin-api 260.43 KB 488.05 KB 139.44% (🟢 -1.78%)
/settings/organizations/appearance 122.33 KB 349.95 KB 99.99% (🟢 -48.03%)
/settings/organizations/billing 260.51 KB 488.13 KB 139.47% (🟢 -1.78%)
/settings/organizations/dsync 293.13 KB 520.75 KB 148.79% (🟢 -1.78%)
/settings/organizations/general 348.82 KB 576.44 KB 164.70% (🟢 -1.77%)
/settings/organizations/members 400 KB 627.62 KB 179.32% (🟢 -1.77%)
/settings/organizations/new 159.66 KB 387.29 KB 110.65% (🟡 +0.47%)
/settings/organizations/privacy 266.03 KB 493.65 KB 141.04% (🟢 -1.78%)
/settings/organizations/profile 413.29 KB 640.91 KB 183.12% (🟡 +1.76%)
/settings/organizations/sso 271.1 KB 498.72 KB 142.49% (🟢 -1.78%)
/settings/organizations/teams/other 261.34 KB 488.96 KB 139.70% (🟢 -1.78%)
/settings/organizations/teams/other/[id]/appearance 273.24 KB 500.86 KB 143.10% (🟢 -1.73%)
/settings/organizations/teams/other/[id]/members 267.94 KB 495.56 KB 141.59% (🟢 -1.78%)
/settings/organizations/teams/other/[id]/profile 471.66 KB 699.28 KB 199.79% (🟢 -1.77%)
/settings/platform 258.9 KB 486.52 KB 139.01% (🟢 -1.80%)
/settings/platform/new 120.67 KB 348.29 KB 99.51% (🟡 +0.51%)
/settings/platform/oauth-clients/[clientId]/edit 257.21 KB 484.83 KB 138.52% (🟢 -1.80%)
/settings/platform/oauth-clients/create 256.35 KB 483.97 KB 138.28% (🟢 -1.80%)
/settings/security/impersonation 265.68 KB 493.3 KB 140.94% (🟢 -1.77%)
/settings/security/password 303.85 KB 531.47 KB 151.85% (🟢 -1.76%)
/settings/security/sso 270.55 KB 498.17 KB 142.33% (🟢 -1.77%)
/settings/security/two-factor-auth 269.16 KB 496.78 KB 141.94% (🟢 -1.78%)
/settings/teams 260.01 KB 487.63 KB 139.32% (🟢 -1.78%)
/settings/teams/[id]/appearance 273.23 KB 500.85 KB 143.10% (🟢 -1.73%)
/settings/teams/[id]/billing 260.51 KB 488.13 KB 139.47% (🟢 -1.78%)
/settings/teams/[id]/members 378.06 KB 605.68 KB 173.05% (🟢 -1.77%)
/settings/teams/[id]/profile 472.44 KB 700.06 KB 200.02% (🟢 -1.77%)
/settings/teams/new 193 KB 420.62 KB 120.18% (🟢 -1.83%)
/teams 254.03 KB 481.65 KB 137.61% (🟢 -1.80%)
/upgrade 254.15 KB 481.77 KB 137.65% (🟢 -1.80%)
/video/[uid] 291.18 KB 518.81 KB 148.23% (🟢 -0.18%)
/workflows 286.05 KB 513.67 KB 146.76% (🟢 -1.74%)
/workflows/[workflow] 414.24 KB 641.86 KB 183.39% (🟢 -1.55%)
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.

@PeerRich PeerRich merged commit 13ec930 into calcom:main Jul 16, 2024
28 of 35 checks passed
p6l-richard pushed a commit to p6l-richard/cal.com-fork that referenced this pull request Jul 22, 2024
* fix: filter admin_api if org is present

* remove admin_api from developers tab when org is present

---------

Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api area: API, enterprise API, access token, OAuth 🐛 bug Something isn't working community Created by Linear-GitHub Sync Low priority Created by Linear-GitHub Sync organizations area: organizations, orgs ready-for-e2e
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-3920] hide "admin api" if organization
3 participants