synced/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2025-03-25 14:05:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 901ff7a605 34c2200269
commit a49d5b121b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/layouts/AppLayout/AppLayout.tsx
View File

@ -273,8 +273,10 @@ export const AppLayout = ({ children }: LayoutProps) => {
const orgUsers = await fetchOrgUsers(currentOrg.id);
await addUsersToProject.mutateAsync({
usernames: orgUsers
.map((member) => member.user.username)
.filter((username) => username !== user.username),
.filter(
(member) => member.user.username !== user.username && member.status === "accepted"
)
.map((member) => member.user.username),
projectId: newProjectId,
orgId: currentOrg.id
});
@ -482,7 +484,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
)}
<Link href={`/org/${currentOrg?.id}/admin`} legacyBehavior>
<DropdownMenuItem className="mt-1 border-t border-mineshaft-600">
Organization Admin Console
Organization Admin Console
</DropdownMenuItem>
</Link>
<div className="mt-1 h-1 border-t border-mineshaft-600" />

6
frontend/src/pages/org/[id]/overview/index.tsx
View File

@ -552,8 +552,10 @@ const OrganizationPage = () => {
await addUsersToProject.mutateAsync({
usernames: orgUsers
.map((member) => member.user.username)
.filter((username) => username !== user.username),
.filter(
(member) => member.user.username !== user.username && member.status === "accepted"
)
.map((member) => member.user.username),
projectId: newProjectId,
orgId: currentOrg.id
});