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.

Sign up for GitHub

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

Jump to bottom

feat: org owner-admin cant see the teams created by other owner-admin 9982 cal 2120 #10430

Merged
merged 31 commits into from
Aug 2, 2023
Merged

feat: org owner-admin cant see the teams created by other owner-admin 9982 cal 2120 #10430

merged 31 commits into from
Aug 2, 2023

Conversation

alannnc
Copy link
Contributor

@alannnc alannnc commented Jul 27, 2023 •
edited
Loading

What does this PR do?

  • If user is owner/admin in org in settings tabs it should displays teams that other owner/admin created but current user don't belong to.

Fixes #9982

Requirement/Documentation

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

Type of change

  • New feature (non-breaking change which adds functionality)

How should this be tested?

  • Are there environment variables that should be set? No
  • What are the minimal test data to have? Org teams with two owner/admins
  • What is expected (happy path) to have (input and output)? One of the two owner/admins should create a new team excluding the other one and from the excluded user he should be able to see other teams created in org.
  • 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 added tests that prove my fix is effective or that my feature works

@alannnc alannnc linked an issue Jul 27, 2023 that may be closed by this pull request
[CAL-2120] Org owner/admin can't see the teams created by other owner/admin #9982
Closed
@linear
Copy link

linear bot commented Jul 27, 2023

CAL-2120 Org owner/admin can't see the teams created by other owner/admin

He should be able to see all teams so that he can add himself to any team he wants.
He shouldn't be able to see a team's event-types unless he has added him to the team.

@vercel
Copy link

vercel bot commented Jul 27, 2023 •
edited
Loading

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

Name Status Preview Comments Updated (UTC)
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 2, 2023 6:46pm
cal-demo ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 2, 2023 6:46pm
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 2, 2023 6:46pm
3 Ignored Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Aug 2, 2023 6:46pm
qa ⬜️ Ignored (Inspect) Visit Preview Aug 2, 2023 6:46pm
ui ⬜️ Ignored (Inspect) Visit Preview Aug 2, 2023 6:46pm

@github-actions github-actions bot added High priority Created by Linear-GitHub Sync organizations area: organizations, orgs 🐛 bug Something isn't working labels Jul 27, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jul 27, 2023 •
edited
Loading

Thank you for following the naming conventions! 🙏

alannnc
alannnc commented Jul 27, 2023
View reviewed changes
packages/features/ee/teams/pages/team-listing-view.tsx
@@ -4,7 +4,7 @@ import { Meta } from "@calcom/ui";
import { getLayout } from "../../../settings/layouts/SettingsLayout";
import { TeamsListing } from "../components";

const BillingView = () => {
const TeamListingView = () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Getting the right name for the component.

leog
leog previously approved these changes Aug 1, 2023
View reviewed changes
Copy link
Contributor

@leog leog left a comment

Choose a reason for hiding this comment

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

Code LGTM 👍

@alannnc
Merge branch '9982-cal-2120-org-owneradmin-cant-see-the-teams-created…
db1103d 
…-by-other-owneradmin' of github.com:calcom/cal.com into 9982-cal-2120-org-owneradmin-cant-see-the-teams-created-by-other-owneradmin
@alannnc
Merge with main
ceff3f6
@alannnc alannnc dismissed stale reviews from sean-brydon and zomars August 2, 2023 19:06

Changes requested were not needed.

PeerRich
PeerRich approved these changes Aug 2, 2023
View reviewed changes
Copy link
Member

@PeerRich PeerRich left a comment

Choose a reason for hiding this comment

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

reapproving on behalf of leo's past review

@PeerRich PeerRich merged commit 871e17a into main Aug 2, 2023
27 of 28 checks passed
@PeerRich PeerRich deleted the 9982-cal-2120-org-owneradmin-cant-see-the-teams-created-by-other-owneradmin branch August 2, 2023 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PeerRich PeerRich PeerRich approved these changes

@leog leog leog left review comments

@sean-brydon sean-brydon Awaiting requested review from sean-brydon

@zomars zomars Awaiting requested review from zomars

Assignees
No one assigned
Labels
🐛 bug Something isn't working core area: core, team members only High priority Created by Linear-GitHub Sync organizations area: organizations, orgs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[CAL-2120] Org owner/admin can't see the teams created by other owner/admin
5 participants
@alannnc @leog @zomars @PeerRich @sean-brydon