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: Organization's Team invite emails #12843

Merged

Conversation

SomayChauhan
Copy link
Member

@SomayChauhan SomayChauhan commented Dec 17, 2023

What does this PR do?

Fixes #12804

FOR ORGANIZATIONS

1. invite a member to a organization and resend invite (no change)

  • invite-to-org

2. add a pending member to a sub-team (change)

  • before
    Screenshot from 2023-12-17 13-47-03

  • after
    Screenshot from 2023-12-17 13-06-15

3. add a pending member to a sub-team and clicking on resend invite (change)

  • before
    Screenshot from 2023-12-17 13-48-13

  • after
    Screenshot from 2023-12-17 13-23-47

4. invite a member to a subTeam directly (change)

  • before
    Screenshot from 2023-12-17 13-49-11

  • after
    Screenshot from 2023-12-17 13-14-38

5. invite a member to a subTeam directly and click on resend invite from sub-team members page (change)

  • before
    Screenshot from 2023-12-17 13-49-11

  • after
    Screenshot from 2023-12-17 13-14-38

FOR NORMAL TEAMS

1. invite a member to a Team directly and click on resend invite (no change)

  • Screenshot from 2023-12-17 13-33-40

PS:

  • these are all the casses i could think of, that usses team-invite-email email template, however there maybe more that i could've missed, in that case do let me know.
  • i have added only one case where the team has a parent and sending a slightly modified email in that case, and please review the language of the email as well, as I'm not very confident about it.
    thank you.

Copy link

vercel bot commented Dec 17, 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 github-actions bot added organizations area: organizations, orgs 🐛 bug Something isn't working 🙋🏻‍♂️help wanted Help from the community is appreciated labels Dec 17, 2023
Copy link
Contributor

github-actions bot commented Dec 17, 2023

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

Copy link
Contributor

github-actions bot commented Dec 17, 2023

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

Copy link

maige-app bot commented Dec 19, 2023

Thank you for the PR! We've labeled it accordingly. Please ensure that any changes are well-documented and that you've followed the contribution guidelines. If there are any additional cases that use the team-invite-email template that you may have missed, please update the PR to include them. Also, we will review the language of the email as requested. Keep up the good work!

@CarinaWolli CarinaWolli requested a review from a team December 19, 2023 16:13
@@ -12,24 +12,30 @@ type TeamInvite = {
joinLink: string;
isCalcomMember: boolean;
isOrg: boolean;
parentTeamName: string | undefined;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
parentTeamName: string | undefined;
parentTeamName?: string;

It makes more sense. As parentTeamName itself isn't undefined but the caller can choose to not pass this.

Copy link
Member

@hariombalhara hariombalhara left a comment

Choose a reason for hiding this comment

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

@SomayChauhan Thanks and great work !!

@hariombalhara hariombalhara merged commit 68d40ca into calcom:main Dec 20, 2023
14 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐛 bug Something isn't working 🙋🏻‍♂️help wanted Help from the community is appreciated organizations area: organizations, orgs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CAL-2811] Organization's Team invite email review and fixes
2 participants