adding error for when invite request fails (#24436)

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
Ben Cooke
2023-10-24 15:52:04 -04:00
коммит произвёл GitHub
родитель c2a3ef6b3d
Коммит cd39edc3ff

Просмотреть файл

@@ -42,6 +42,11 @@ export function sendMembersInvites(teamId: string, users: UserProfile[], emails:
if (usersToAdd.length > 0) { if (usersToAdd.length > 0) {
const response = await dispatch(addUsersToTeam(teamId, usersToAdd.map((u) => u.id))); const response = await dispatch(addUsersToTeam(teamId, usersToAdd.map((u) => u.id)));
const members = response.data || []; const members = response.data || [];
if (response.error) {
for (const userToAdd of usersToAdd) {
notSent.push({user: userToAdd, reason: response.error.message});
}
} else {
for (const userToAdd of usersToAdd) { for (const userToAdd of usersToAdd) {
const memberWithError = members.find((m: TeamMemberWithError) => m.user_id === userToAdd.id && m.error); const memberWithError = members.find((m: TeamMemberWithError) => m.user_id === userToAdd.id && m.error);
if (memberWithError) { if (memberWithError) {
@@ -51,6 +56,7 @@ export function sendMembersInvites(teamId: string, users: UserProfile[], emails:
} }
} }
} }
}
if (emails.length > 0) { if (emails.length > 0) {
let response; let response;
try { try {
@@ -232,6 +238,11 @@ export function sendMembersInvitesToChannels(
if (usersToAdd.length > 0) { if (usersToAdd.length > 0) {
const response = await dispatch(addUsersToTeam(teamId, usersToAdd.map((u) => u.id))); const response = await dispatch(addUsersToTeam(teamId, usersToAdd.map((u) => u.id)));
const members = response.data || []; const members = response.data || [];
if (response.error) {
for (const userToAdd of usersToAdd) {
notSent.push({user: userToAdd, reason: response.error.message});
}
} else {
for (const userToAdd of usersToAdd) { for (const userToAdd of usersToAdd) {
const memberWithError = members.find((m: TeamMemberWithError) => m.user_id === userToAdd.id && m.error); const memberWithError = members.find((m: TeamMemberWithError) => m.user_id === userToAdd.id && m.error);
if (memberWithError) { if (memberWithError) {
@@ -241,6 +252,7 @@ export function sendMembersInvitesToChannels(
} }
} }
} }
}
if (emails.length > 0) { if (emails.length > 0) {
let response; let response;
try { try {