Merge pull request #2299 from akhilmhdh/fix/#2288

fix: resolved add all members to project failing when there is pending users in organization
This commit is contained in:
Maidul Islam
2024-08-16 20:52:43 -04:00
committed by GitHub
2 changed files with 9 additions and 5 deletions
+4 -2
View File
@@ -273,8 +273,10 @@ export const AppLayout = ({ children }: LayoutProps) => {
const orgUsers = await fetchOrgUsers(currentOrg.id); const orgUsers = await fetchOrgUsers(currentOrg.id);
await addUsersToProject.mutateAsync({ await addUsersToProject.mutateAsync({
usernames: orgUsers usernames: orgUsers
.map((member) => member.user.username) .filter(
.filter((username) => username !== user.username), (member) => member.user.username !== user.username && member.status === "accepted"
)
.map((member) => member.user.username),
projectId: newProjectId, projectId: newProjectId,
orgId: currentOrg.id orgId: currentOrg.id
}); });
@@ -552,8 +552,10 @@ const OrganizationPage = () => {
await addUsersToProject.mutateAsync({ await addUsersToProject.mutateAsync({
usernames: orgUsers usernames: orgUsers
.map((member) => member.user.username) .filter(
.filter((username) => username !== user.username), (member) => member.user.username !== user.username && member.status === "accepted"
)
.map((member) => member.user.username),
projectId: newProjectId, projectId: newProjectId,
orgId: currentOrg.id orgId: currentOrg.id
}); });