Send invites when people added to roles or teams

Author: jzongker

src/components/SendInviteDialog.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Typography, CircularProgress, Alert } from "@mui/material";
-import { ApiHelper } from "@churchapps/apphelper";
+import { ApiHelper, UserHelper } from "@churchapps/apphelper";
 
 interface Props {
   open: boolean;
@@ -22,7 +22,8 @@ export const SendInviteDialog: React.FC<Props> = (props) => {
       await ApiHelper.post("/users/sendInviteEmail", {
         email: props.personEmail,
         personName: props.personName,
-        contextName: props.contextName
+        contextName: props.contextName,
+        churchName: UserHelper.currentUserChurch?.church?.name || ""
       }, "MembershipApi");
       setSent(true);
       setTimeout(() => props.onClose(), 1500);

src/groups/components/GroupMembers.tsx

@@ -1,4 +1,4 @@
-import React, { useState, memo, useMemo, useCallback } from "react";
+import React, { useState, memo, useMemo, useCallback, useRef } from "react";
 import {
   type GroupInterface,
   type GroupMemberInterface,
@@ -70,8 +70,12 @@ export const GroupMembers: React.FC<Props> = memo((props) => {
     [groupMembers.data]
   );
 
+  const addedPersonIdRef = useRef<string>(null);
+
   const handleAdd = useCallback(async () => {
+    if (addedPersonIdRef.current === props.addedPerson.id) return;
     if (getMemberByPersonId(props.addedPerson.id) === null) {
+      addedPersonIdRef.current = props.addedPerson.id;
       const gm = { groupId: props.group.id, personId: props.addedPerson.id, person: props.addedPerson } as GroupMemberInterface;
       await ApiHelper.post("/groupmembers", [gm], "MembershipApi");
       groupMembers.refetch();

src/settings/components/UserAdd.tsx

@@ -42,8 +42,8 @@ export const UserAdd = (props: Props) => {
   const [inviteEmail, setInviteEmail] = useState<string>("");
   const [invitePersonName, setInvitePersonName] = useState<string>("");
 
-  const showInviteOrFinish = (emailAddr: string, personName: string, isNewUser: boolean) => {
-    if (isNewUser || !emailAddr) {
+  const showInviteOrFinish = (emailAddr: string, personName: string) => {
+    if (!emailAddr) {
       props.updatedFunction();
     } else {
       setInviteEmail(emailAddr);
@@ -62,7 +62,7 @@ export const UserAdd = (props: Props) => {
         person.name.first = firstName;
         person.name.last = lastName;
         await ApiHelper.post("/people", [person], "MembershipApi");
-        showInviteOrFinish(email, firstName, false);
+        showInviteOrFinish(email, firstName);
       } catch {
         setErrors([Locale.label("settings.userAdd.errAnother")]);
       }
@@ -74,7 +74,7 @@ export const UserAdd = (props: Props) => {
       const user = await createUserAndToGroup(firstName, lastName, email);
       const person = await createPerson(user.id);
       await linkUserAndPerson(user.id, person.id);
-      showInviteOrFinish(email, firstName, user.isNewUser === true);
+      showInviteOrFinish(email, firstName);
     }
   };
 
@@ -99,7 +99,7 @@ export const UserAdd = (props: Props) => {
       setErrors([Locale.label("settings.userAdd.errDiff")]);
     }
 
-    showInviteOrFinish(userEmail, first, user.isNewUser === true);
+    showInviteOrFinish(userEmail, first);
   };
 
   const handleSave = async () => {
@@ -171,7 +171,7 @@ export const UserAdd = (props: Props) => {
         setErrors([Locale.label("settings.userAdd.errDiff")]);
         return;
       }
-      showInviteOrFinish(userEmail, first, user.isNewUser === true);
+      showInviteOrFinish(userEmail, first);
     }
   };