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

fix: adding team members from organization tab that alredy exist #11689

Merged
merged 11 commits into from
Dec 7, 2023
Merged

fix: adding team members from organization tab that alredy exist #11689

merged 11 commits into from
Dec 7, 2023

Conversation

SomayChauhan
Copy link
Member

@SomayChauhan SomayChauhan commented Oct 4, 2023 •
edited

What does this PR do?

Fixes
#11687
Screencast from 04-10-23 02:07:29 PM IST.webm

#11691

  • the bug was caused by some pagination logic so ichanged the organizations.listOtherTeamMembers from useQuery to useInfiniteQuery
Screencast.from.05-10-23.01.30.38.PM.IST.webm
  • Bug fix (non-breaking change which fixes an issue)

@vercel
Copy link

vercel bot commented Oct 4, 2023 •
edited

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

Name Status Preview Comments Updated (UTC)
ui ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 9, 2023 4:04pm

@vercel
Copy link

vercel bot commented Oct 4, 2023

@SomayChauhan is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2023 •
edited

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

@github-actions github-actions bot added teams area: teams, round robin, collective, managed event-types 🐛 bug Something isn't working labels Oct 4, 2023
SomayChauhan
SomayChauhan commented Oct 4, 2023
View reviewed changes
packages/trpc/server/routers/viewer/organizations/getMembers.handler.ts
Copy link
Member Author

Choose a reason for hiding this comment

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

i couldnt figure out the syntax to do it in a single prisma request

@github-actions
Copy link
Contributor

github-actions bot commented Oct 4, 2023 •
edited

📦 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! 🙌

@PeerRich PeerRich added the Medium priority Created by Linear-GitHub Sync label Oct 5, 2023
@PeerRich PeerRich requested a review from a team October 5, 2023 13:33
@github-actions github-actions bot added the 🚨 merge conflict This PR has a merge conflict that has to be addressed label Oct 5, 2023
@github-actions github-actions bot added 🚨 merge conflict This PR has a merge conflict that has to be addressed and removed 🚨 merge conflict This PR has a merge conflict that has to be addressed labels Oct 6, 2023
@github-actions github-actions bot removed the 🚨 merge conflict This PR has a merge conflict that has to be addressed label Oct 7, 2023
Udit-takkar
Udit-takkar reviewed Oct 9, 2023
View reviewed changes
Copy link
Contributor

@Udit-takkar Udit-takkar left a comment

Choose a reason for hiding this comment

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

Screen.Recording.2023-10-09.at.7.55.56.PM.mov

@SomayChauhan

  1. I still get the error
  2. Don't push yarn.lock file if you don't make any change in package.json file.

use this command git checkout origin/main -- yarn.lock and then push that yarn.lock to undo the changes.

@Udit-takkar
Copy link
Contributor

@sean-brydon IIRC you build some feature in bulk invite in which even if we pass usernamesOrEmails that have been already invited, it won't throw any error

@SomayChauhan
Copy link
Member Author

should be fixed now
i invalidated the query in the wrong place

Screencast.from.09-10-23.09.31.26.PM.IST.webm

@github-actions
Copy link
Contributor

Hey there, there is a merge conflict, can you take a look?

@github-actions github-actions bot added the 🚨 merge conflict This PR has a merge conflict that has to be addressed label Oct 20, 2023
@Udit-takkar Udit-takkar self-requested a review October 21, 2023 07:31
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 5, 2023

This PR is being marked as stale due to inactivity.

@github-actions github-actions bot added the Stale label Nov 5, 2023
@sean-brydon sean-brydon self-requested a review November 6, 2023 09:16
@github-actions github-actions bot removed the Stale label Nov 7, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 2, 2023

This PR is being marked as stale due to inactivity.

@github-actions github-actions bot added the Stale label Dec 2, 2023
hariombalhara
hariombalhara previously approved these changes Dec 6, 2023
View reviewed changes
@hariombalhara hariombalhara added automerge and removed 🚨 merge conflict This PR has a merge conflict that has to be addressed labels Dec 6, 2023
@github-actions github-actions bot removed the Stale label Dec 7, 2023
@kodiakhq kodiakhq bot merged commit 75eaed1 into calcom:main Dec 7, 2023
33 of 41 checks passed
@SomayChauhan SomayChauhan mentioned this pull request Dec 12, 2023
Merged
hbjORbj pushed a commit to codemod-com/cal.com-demo that referenced this pull request Dec 21, 2023
@SomayChauhan @PeerRich
@hariombalhara @hbjORbj
fix: adding team members from organization tab that alredy exist (cal…
8d5a3d6 
…com#11689)

* fix: adding team members from organization tab that alredy exist

* changed organizations.listOtherTeamMembers from useQuery to useInfiniteQuery

* undo yarn.lock

* fix: invalidate the organizations.getMembers query on removeMember and inviteMember Mutation

---------

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Hariom <hariombalhara@gmail.com>
haranrk pushed a commit to haranrk/cal.com that referenced this pull request Jan 4, 2024
@SomayChauhan @PeerRich
@hariombalhara @haranrk
fix: adding team members from organization tab that alredy exist (cal…
dc58361 
…com#11689)

* fix: adding team members from organization tab that alredy exist

* changed organizations.listOtherTeamMembers from useQuery to useInfiniteQuery

* undo yarn.lock

* fix: invalidate the organizations.getMembers query on removeMember and inviteMember Mutation

---------

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Hariom <hariombalhara@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hariombalhara hariombalhara hariombalhara approved these changes

@Udit-takkar Udit-takkar Awaiting requested review from Udit-takkar

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

Assignees
No one assigned
Labels
automerge 🐛 bug Something isn't working Medium priority Created by Linear-GitHub Sync teams area: teams, round robin, collective, managed event-types
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@SomayChauhan @Udit-takkar @hariombalhara @PeerRich