fix: Update visibility of team members based on user role #14629

sean-brydon · 2024-04-17T09:46:41Z

What does this PR do?

Fixes CAL-3484

Requirement/Documentation

If there is a requirement document, please, share it here.
If there is a UI/UX design document, please, share it here.

Type of change

Bug fix (non-breaking change which fixes an issue)
Chore (refactoring code, technical debt, workflow improvements)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Tests (Unit/Integration/E2E or any other test)
This change requires a documentation update

How should this be tested?

Are there environment variables that should be set?
What are the minimal test data to have?
What is expected (happy path) to have (input and output)?
Any other important info that could help to test that PR

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

Checklist

I haven't read the contributing guide
My code doesn't follow the style guidelines of this project
I haven't commented my code, particularly in hard-to-understand areas
I haven't checked if my PR needs changes to the documentation
I haven't checked if my changes generate no new warnings
I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

… are not org admin

vercel · 2024-04-17T09:46:43Z

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

Name	Status	Preview	Comments	Updated (UTC)
ai	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 22, 2024 1:33pm
platform-starter-kit	❌ Failed (Inspect)			Apr 22, 2024 1:33pm

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Apr 22, 2024 1:33pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Apr 22, 2024 1:33pm

github-actions · 2024-04-17T09:46:53Z

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

sean-brydon · 2024-04-17T09:46:57Z

fix: Update visibility of team members based on user role #14629 👈
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @sean-brydon and the rest of your teammates on Graphite

sean-brydon · 2024-04-17T09:49:11Z

packages/trpc/server/routers/viewer/teams/get.handler.ts

  const hideMembers =
-    (ctx.user.profile?.organization?.isPrivate && !ctx.user.organization?.isOrgAdmin) ||
+    (isOrgPrivate && !isOrgAdminOrOwner && input.teamId === ctx.user.organizationId) ||


We need to check the teamId here to ensure we are not targeting a team other than the org ID

github-actions · 2024-04-17T09:59:11Z

📦 Next.js Bundle Analysis for @calcom/web

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

This PR introduced no changes to the JavaScript bundle! 🙌

deploysentinel · 2024-04-17T09:59:56Z

Current Playwright Test Results Summary

✅ 314 Passing - ⚠️ 13 Flaky

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

(Last updated on 04/22/2024 01:44:25pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 2b546f6

Started: 04/22/2024 01:40:47pm UTC

⚠️ Flakes

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Workflow Tab - Event Type Check the functionalities of the Workflow Tab Team Workflows Admin user Retry 1 • Initial Attempt	0.47% (1) 1 / 214 run failed over last 7 days	0.47% (1) 1 / 214 run flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Update Profile Can update a users email (verification enabled) Retry 1 • Initial Attempt	6.02% (13) 13 / 216 runs failed over last 7 days	28.24% (61) 61 / 216 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Payment app Should not display App is not setup already for non payment app Retry 1 • Initial Attempt	0% (0) 0 / 217 runs failed over last 7 days	0.46% (1) 1 / 217 run flaked over last 7 days

📄 apps/web/playwright/event-types.e2e.ts • 2 Flakes

Top 1 Common Error Messages

`null`	2 Test Cases Affected

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Event Types tests -- future user Different Locations Tests can add Attendee Phone Number location and book with it Retry 1 • Initial Attempt	0% (0) 0 / 244 runs failed over last 7 days	6.97% (17) 17 / 244 runs flaked over last 7 days
Event Types tests -- future user Different Locations Tests Can add Cal video location and book with it Retry 1 • Initial Attempt	11.89% (29) 29 / 244 runs failed over last 7 days	3.69% (9) 9 / 244 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Teams - NonOrg -- future Can create a booking for Round Robin EventType Retry 1 • Initial Attempt	13.25% (33) 33 / 249 runs failed over last 7 days	17.27% (43) 43 / 249 runs flaked over last 7 days

📄 apps/web/playwright/settings-admin.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Settings/admin tests -- future should render /settings/admin page Retry 1 • Initial Attempt	1.19% (3) 3 / 252 runs failed over last 7 days	1.98% (5) 5 / 252 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 Test preview should return correct route Retry 1 • Initial Attempt	0% (0) 0 / 241 runs failed over last 7 days	34.85% (84) 84 / 241 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Preview Preview - embed-core should load Retry 1 • Initial Attempt	0% (0) 0 / 243 runs failed over last 7 days	41.56% (101) 101 / 243 runs flaked over last 7 days

📄 apps/web/playwright/organization/across-org/across-org.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
user1NotMemberOfOrg1 is part of team1MemberOfOrg1 EventTypes listing should show correct link for user events and team1MemberOfOrg1's events Retry 2 • Retry 1 • Initial Attempt	1.59% (4) 4 / 251 runs failed over last 7 days	7.17% (18) 18 / 251 runs flaked over last 7 days

📄 apps/web/playwright/app-store.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
App Store - Authed -- future Browse apple-calendar and try to install Retry 1 • Initial Attempt	0% (0) 0 / 243 runs failed over last 7 days	0.82% (2) 2 / 243 runs flaked over last 7 days

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

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Reschedule Tests Should display request reschedule send on bookings/cancelled Retry 1 • Initial Attempt	0% (0) 0 / 220 runs failed over last 7 days	0.45% (1) 1 / 220 run flaked over last 7 days

📄 packages/embeds/embed-react/playwright/tests/basic.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
React Embed Element Click Popup should verify that the iframe got created with correct URL - namespaced Retry 1 • Initial Attempt	21.78% (22) 22 / 101 runs failed over last 7 days	35.64% (36) 36 / 101 runs flaked over last 7 days

View Detailed Build Results

graphite-app · 2024-04-17T10:55:13Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (04/17/24)

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

hariombalhara · 2024-04-17T11:20:08Z

packages/trpc/server/routers/viewer/teams/get.handler.ts

  const hideMembers =
-    (ctx.user.profile?.organization?.isPrivate && !ctx.user.organization?.isOrgAdmin) ||
+    (isOrgPrivate && !isOrgAdminOrOwner && input.teamId === ctx.user.organizationId) ||


I think it could make more sense to convert it into a function that does it something like this

function shouldHideMembers() { if (!team.isPrivate) { return false; } return isTeamAnOrg ? !isOrgAdminOrOwner : !isOrgAdminOrOwner && !isTeamAdminOrOwner }

Udit-takkar

@sean-brydon can you also add automated tests for the fix?

sean-brydon · 2024-04-17T12:31:57Z

@sean-brydon can you also add automated tests for the fix?

Yep working on it now <3

sean-brydon · 2024-04-17T13:35:49Z

apps/web/playwright/fixtures/orgs.ts

 }) {
  return await prisma.team.create({
    data: {
      name: name,
      slug: slug,
      isOrganization: true,
+      isPrivate: isPrivate,


Allow us to create private orgs

sean-brydon · 2024-04-17T13:36:01Z

apps/web/playwright/fixtures/users.ts

@@ -788,7 +788,7 @@ const createUser = (
              },
            },
            accepted: true,
-            role: MembershipRole.ADMIN,
+            role,


Actualy pass in the role to the figure - previously all were admin

sean-brydon · 2024-04-17T13:36:21Z

apps/web/playwright/organization/organization-privacy.e2e.ts

+    const tableLocator = await page.getByTestId("team-member-list-container");
+    await expect(tableLocator).toBeVisible();
+
+    const memberUser = await prisma.membership.findFirst({


Easier than selecting from the UI

packages/trpc/server/routers/viewer/teams/get.handler.ts

linear · 2024-04-18T08:56:29Z

CAL-3484 When org and team is private - team admin can't see members

packages/trpc/server/routers/viewer/teams/get.handler.ts

hariombalhara

LGTM now !! Thanks for the tests @sean-brydon

…n_when_org_is_private_and_they_are_not_org_admin

fix: team memebrs being hidden for admin when org is private and they…

9ad252a

… are not org admin

vercel bot had a problem deploying to Preview – platform-starter-kit April 17, 2024 09:46 Failure

keithwillcode added consumer core area: core, team members only labels Apr 17, 2024

sean-brydon changed the title ~~fix: team memebrs being hidden for admin when org is private and they are not org admin~~ fix: team members being hidden for admin when org is private and they are not org admin Apr 17, 2024

chore: remove console.loog

5cec14a

sean-brydon changed the title ~~fix: team members being hidden for admin when org is private and they are not org admin~~ fix: Update visibility of team members based on user role Apr 17, 2024

vercel bot had a problem deploying to Preview – platform-starter-kit April 17, 2024 09:48 Failure

sean-brydon commented Apr 17, 2024

View reviewed changes

vercel bot deployed to Preview – ai April 17, 2024 09:51 View deployment

vercel bot deployed to Preview – api April 17, 2024 09:59 View deployment

vercel bot deployed to Preview – dev April 17, 2024 10:22 View deployment

sean-brydon marked this pull request as ready for review April 17, 2024 10:53

graphite-app bot requested a review from a team April 17, 2024 10:53

dosubot bot added teams area: teams, round robin, collective, managed event-types 🐛 bug Something isn't working labels Apr 17, 2024

hariombalhara reviewed Apr 17, 2024

View reviewed changes

Udit-takkar reviewed Apr 17, 2024

View reviewed changes

sean-brydon added 3 commits April 17, 2024 13:35

chore: make permissionCheck more readable

a1237d9

test: push e2e test for normal privacy banner in orgs

8fddf0f

test: add a few more edge cases

6288da6

vercel bot had a problem deploying to Preview – platform-starter-kit April 17, 2024 13:36 Failure

sean-brydon commented Apr 17, 2024

View reviewed changes

vercel bot deployed to Preview – dev April 17, 2024 13:53 View deployment

sean-brydon requested a review from hariombalhara April 18, 2024 07:54

hariombalhara reviewed Apr 18, 2024

View reviewed changes

packages/trpc/server/routers/viewer/teams/get.handler.ts Show resolved Hide resolved

hariombalhara reviewed Apr 18, 2024

View reviewed changes

packages/trpc/server/routers/viewer/teams/get.handler.ts Outdated Show resolved Hide resolved

chore: negate names

007b229

vercel bot deployed to Preview – api April 18, 2024 08:43 View deployment

vercel bot had a problem deploying to Preview – platform-starter-kit April 18, 2024 08:45 Failure

feat: update func to make more sense

f514ff3

vercel bot deployed to Preview – api April 18, 2024 08:53 View deployment

vercel bot had a problem deploying to Preview – platform-starter-kit April 18, 2024 08:54 Failure

hariombalhara reviewed Apr 18, 2024

View reviewed changes

packages/trpc/server/routers/viewer/teams/get.handler.ts Outdated Show resolved Hide resolved

Fix

97947ee

vercel bot had a problem deploying to Preview – platform-starter-kit April 18, 2024 09:04 Failure

vercel bot deployed to Preview – api April 18, 2024 09:10 View deployment

hariombalhara approved these changes Apr 18, 2024

View reviewed changes

vercel bot deployed to Preview – dev April 18, 2024 09:37 View deployment

sean-brydon enabled auto-merge (squash) April 18, 2024 10:53

Merge branch 'main' into 04-17-fix_team_memebrs_being_hidden_for_admi…

f247e97

…n_when_org_is_private_and_they_are_not_org_admin

vercel bot deployed to Preview – ai April 19, 2024 09:47 View deployment

vercel bot had a problem deploying to Preview – platform-starter-kit April 19, 2024 09:48 Failure

vercel bot deployed to Preview – api April 19, 2024 09:51 View deployment

vercel bot deployed to Preview – dev April 19, 2024 10:03 View deployment

Merge branch 'main' into 04-17-fix_team_memebrs_being_hidden_for_admi…

2b546f6

…n_when_org_is_private_and_they_are_not_org_admin

vercel bot had a problem deploying to Preview – platform-starter-kit April 22, 2024 13:29 Failure

vercel bot deployed to Preview – ai April 22, 2024 13:33 View deployment

vercel bot deployed to Preview – api April 22, 2024 13:38 View deployment

sean-brydon merged commit 3ce6c23 into main Apr 22, 2024
37 of 39 checks passed

sean-brydon deleted the 04-17-fix_team_memebrs_being_hidden_for_admin_when_org_is_private_and_they_are_not_org_admin branch April 22, 2024 13:45

vercel bot deployed to Preview – dev April 22, 2024 13:47 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Update visibility of team members based on user role #14629

fix: Update visibility of team members based on user role #14629

sean-brydon commented Apr 17, 2024 •

edited

Loading

vercel bot commented Apr 17, 2024 •

edited

Loading

github-actions bot commented Apr 17, 2024 •

edited

Loading

sean-brydon commented Apr 17, 2024

sean-brydon Apr 17, 2024

github-actions bot commented Apr 17, 2024 •

edited

Loading

deploysentinel bot commented Apr 17, 2024 •

edited

Loading

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

graphite-app bot commented Apr 17, 2024

hariombalhara Apr 17, 2024 •

edited

Loading

Udit-takkar left a comment

sean-brydon commented Apr 17, 2024

sean-brydon Apr 17, 2024

sean-brydon Apr 17, 2024

sean-brydon Apr 17, 2024

linear bot commented Apr 18, 2024

hariombalhara left a comment

fix: Update visibility of team members based on user role #14629

fix: Update visibility of team members based on user role #14629

Conversation

sean-brydon commented Apr 17, 2024 • edited Loading

What does this PR do?

Requirement/Documentation

Type of change

How should this be tested?

Mandatory Tasks

Checklist

vercel bot commented Apr 17, 2024 • edited Loading

github-actions bot commented Apr 17, 2024 • edited Loading

sean-brydon commented Apr 17, 2024

sean-brydon Apr 17, 2024

Choose a reason for hiding this comment

github-actions bot commented Apr 17, 2024 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Apr 17, 2024 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Test Case Results

Top 1 Common Error Messages

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

graphite-app bot commented Apr 17, 2024

Graphite Automations

hariombalhara Apr 17, 2024 • edited Loading

Choose a reason for hiding this comment

Udit-takkar left a comment

Choose a reason for hiding this comment

sean-brydon commented Apr 17, 2024

sean-brydon Apr 17, 2024

Choose a reason for hiding this comment

sean-brydon Apr 17, 2024

Choose a reason for hiding this comment

sean-brydon Apr 17, 2024

Choose a reason for hiding this comment

linear bot commented Apr 18, 2024

hariombalhara left a comment

Choose a reason for hiding this comment

sean-brydon commented Apr 17, 2024 •

edited

Loading

vercel bot commented Apr 17, 2024 •

edited

Loading

github-actions bot commented Apr 17, 2024 •

edited

Loading

github-actions bot commented Apr 17, 2024 •

edited

Loading

deploysentinel bot commented Apr 17, 2024 •

edited

Loading

hariombalhara Apr 17, 2024 •

edited

Loading