awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-11 10:28:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement: address feedback

Browse Source
This commit is contained in:
Scott Wilson
2025-06-27 21:00:48 -07:00
parent ed7d709a70
commit 48f40ff938
1 changed files with 141 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+13 -19
View File
@@ -392,7 +392,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
</IconButton> </IconButton>
</div> </div>
</Th> </Th>
<Th> <Th className="w-1/3">
<div className="flex items-center"> <div className="flex items-center">
Role Role
<IconButton <IconButton
@@ -462,19 +462,6 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
a={OrgPermissionSubjects.Member} a={OrgPermissionSubjects.Member}
> >
{(isAllowed) => ( {(isAllowed) => (
<>
{!isActive && (
<Button
isDisabled
className="w-40"
colorSchema="primary"
variant="outline_bg"
onClick={() => {}}
>
Suspended
</Button>
)}
{isActive && status === "accepted" && (
<Select <Select
value={role === "custom" ? findRoleFromId(roleId)?.slug : role} value={role === "custom" ? findRoleFromId(roleId)?.slug : role}
isDisabled={userId === u?.id || !isAllowed} isDisabled={userId === u?.id || !isAllowed}
@@ -496,13 +483,22 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
))} ))}
</Select> </Select>
)} )}
</OrgPermissionCan>
</Td>
<Td>
<div className="flex items-center justify-end gap-6">
{isActive && {isActive &&
(status === "invited" || status === "verified") && (status === "invited" || status === "verified") &&
email && email &&
serverDetails?.emailConfigured && ( serverDetails?.emailConfigured && (
<OrgPermissionCan
I={OrgPermissionActions.Edit}
a={OrgPermissionSubjects.Member}
>
{(isAllowed) => (
<Button <Button
isDisabled={!isAllowed} isDisabled={!isAllowed}
className="h-8 w-48 border-mineshaft-600 bg-mineshaft-700 font-normal" className="h-8 border-mineshaft-600 bg-mineshaft-700 font-normal"
colorSchema="primary" colorSchema="primary"
variant="outline_bg" variant="outline_bg"
onClick={(e) => { onClick={(e) => {
@@ -513,11 +509,8 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
Resend Invite Resend Invite
</Button> </Button>
)} )}
</>
)}
</OrgPermissionCan> </OrgPermissionCan>
</Td> )}
<Td>
<DropdownMenu> <DropdownMenu>
<DropdownMenuTrigger asChild> <DropdownMenuTrigger asChild>
<IconButton <IconButton
@@ -625,6 +618,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
</OrgPermissionCan> </OrgPermissionCan>
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
</div>
</Td> </Td>
</Tr> </Tr>
); );