Skip to content

feat: Org settings - profile,appearance, child teams, create new child#9231

Merged
zomars merged 111 commits into
mainfrom
feat/org-settings
Jun 15, 2023
Merged

feat: Org settings - profile,appearance, child teams, create new child#9231
zomars merged 111 commits into
mainfrom
feat/org-settings

Conversation

@sean-brydon
Copy link
Copy Markdown
Member

@sean-brydon sean-brydon commented May 31, 2023

This is a stacked PR - it should be merged after #9202

Long winded loom: https://www.loom.com/share/32c4fbdbab8844568b541d48a01e95ba

Adds a few org settings pages

  • Profile

  • appearance

  • Create team now creates nested teams

  • hide billing on child teams

  • Hide team update pages if you are not owner|admin of team OR org owner/admin

  • Handle billing on newly created teams/ORGS

CleanShot 2023-05-31 at 14 48 21@2x
CleanShot 2023-05-31 at 14 48 05@2x
CleanShot 2023-05-31 at 14 47 54@2x

leog and others added 29 commits May 19, 2023 10:30
* Change scopedMembers to orgMembers

* Change to orgUsers
@vercel
Copy link
Copy Markdown

vercel Bot commented May 31, 2023

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

Name Status Preview Comments Updated (UTC)
api ❌ Failed (Inspect) Jun 15, 2023 11:07am
cal ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 15, 2023 11:07am
web 🛑 Canceled (Inspect) Jun 15, 2023 11:07am
web-staging ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 15, 2023 11:07am
1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
ui ⬜️ Ignored (Inspect) Visit Preview Jun 15, 2023 11:07am

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 14, 2023

📦 Next.js Bundle Analysis for @calcom/web

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

New Pages Added

The following pages were added to the bundle from the code in this PR:

Page Size (compressed) First Load % of Budget (350 KB)
/settings/organizations/appearance 261.18 KB 412.49 KB 117.85%
/settings/organizations/general 327.26 KB 478.56 KB 136.73%
/settings/organizations/members 364.42 KB 515.73 KB 147.35%
/settings/organizations/profile 369.25 KB 520.55 KB 148.73%

One Page Changed Size

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

Page Size (compressed) First Load % of Budget (350 KB)
/settings/teams/[id]/members 366.69 KB 517.99 KB 148.00% (🟡 +2.15%)
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
Copy Markdown

deploysentinel Bot commented Jun 14, 2023

Current Playwright Test Results Summary

✅ 114 Passing - ⚠️ 5 Flaky

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

(Last updated on 06/15/2023 11:08:26am UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 84652b9

Started: 06/15/2023 11:06:02am UTC

⚠️ Flakes

📄   apps/web/playwright/managed-event-types.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Managed Event Types tests Can create managed event type
Retry 2Retry 1Initial Attempt
4.86% (12) 12 / 247 runs
failed over last 7 days
16.60% (41) 41 / 247 runs
flaked over last 7 days

📄   apps/web/playwright/event-types.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Event Types tests user -- old-booker can add multiple organizer address
Retry 1Initial Attempt
0.82% (2) 2 / 243 runs
failed over last 7 days
16.05% (39) 39 / 243 runs
flaked over last 7 days

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

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
0% (0) 0 / 141 runs
failed over last 7 days
9.93% (14) 14 / 141 runs
flaked over last 7 days

📄   packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Popup Tests should be able to reschedule
Retry 1Initial Attempt
6% (9) 9 / 150 runs
failed over last 7 days
94% (141) 141 / 150 runs
flaked over last 7 days

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

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
FORM_SUBMITTED can submit a form and get a submission event
Retry 1Initial Attempt
10.96% (8) 8 / 73 runs
failed over last 7 days
8.22% (6) 6 / 73 runs
flaked over last 7 days

View Detailed Build Results


Copy link
Copy Markdown
Contributor

@zomars zomars left a comment

Choose a reason for hiding this comment

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

Fixed conflicts. Please double check them to see if I've missed something @sean-brydon 🙏🏽


const isOrgAdmin = !!(await isOrganisationAdmin(ctx.user.id, ctx.user?.organization?.id ?? -1)); // Org id exists here as we're inside a conditional TS complaining for some reason

return membershipsWithoutParent.map(({ team, ...membership }) => ({
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is breaking types in several places

@hariombalhara
Copy link
Copy Markdown
Member

Screenshot 2023-06-15 at 5 34 31 PM Broken UI when I change username during profile onboarding.

@sean-brydon
Copy link
Copy Markdown
Member Author

Screenshot 2023-06-15 at 5 34 31 PM Broken UI when I change username during profile onboarding.

I think this may be an issue with the component. I didnt touch any of this in this PR. Happy to raise a follow up and fix

@hariombalhara
Copy link
Copy Markdown
Member

Screenshot 2023-06-15 at 6 38 45 PM Empty view when there are no teams

@hariombalhara
Copy link
Copy Markdown
Member

hariombalhara commented Jun 15, 2023

Noticed that the owner of the organization can't see the teams he created(during onboarding) on /teams page. Happening because, we aren't creating the membership of that user with the teams. I think we need to fix it, so that he can add members to the teams later on.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

❗️ .env changes contains changes to env variables High priority Created by Linear-GitHub Sync ❗️ migrations contains migration files organizations area: organizations, orgs

Projects

No open projects
Status: High priority

Development

Successfully merging this pull request may close these issues.

10 participants