Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

use design system button

Thiago Araujo da Silvad6619b757e73
diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/GroupAccessPopover.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/GroupAccessPopover.tsx
index 7e016eaae3..efb15047fe 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/GroupAccessPopover.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/GroupAccessPopover.tsx
@@ -1,9 +1,9 @@
-import { useState } from "react";
import { Link } from "@tanstack/react-router";
import { UsersIcon, XIcon } from "lucide-react";
import {
Badge,
+ Button,
IconButton,
Popover,
PopoverContent,
@@ -20,6 +20,9 @@ type Props = {
groups: TOrgUserAccessGroup[];
hasDirectAccess: boolean;
getRoleName: (role: TOrgUserAccessGroupRole) => string;
+ isOpen: boolean;
+ onOpenChange: (isOpen: boolean) => void;
+ keepFocusOnClose: boolean;
};
const MAX_VISIBLE_ROLES = 1;
@@ -74,26 +77,37 @@ const GroupRoleBadges = ({
);
};
-export const GroupAccessPopover = ({ orgId, groups, hasDirectAccess, getRoleName }: Props) => {
- const [isOpen, setIsOpen] = useState(false);
-
+// Open state lives in the table so opening one row's popover closes any other.
+export const GroupAccessPopover = ({
+ orgId,
+ groups,
+ hasDirectAccess,
+ getRoleName,
+ isOpen,
+ onOpenChange,
+ keepFocusOnClose
+}: Props) => {
return (
- <Popover open={isOpen} onOpenChange={setIsOpen}>
+ <Popover open={isOpen} onOpenChange={onOpenChange}>
<PopoverTrigger asChild>
- <button
- type="button"
+ <Button
+ variant="ghost"
+ size="xs"
aria-label="Show groups granting access"
- className="-mx-1.5 flex cursor-pointer items-center gap-1.5 rounded-md px-1.5 py-1 text-sm text-foreground transition-colors hover:bg-foreground/10 data-[state=open]:bg-foreground/10"
+ className="-mx-2 gap-1.5 text-sm"
onClick={(e) => e.stopPropagation()}
>
- <UsersIcon className="size-4 text-muted" />
+ <UsersIcon className="text-muted" />
<span className="underline decoration-muted underline-offset-2">{groups.length}</span>
- </button>
+ </Button>
</PopoverTrigger>
<PopoverContent
align="start"
className="flex max-h-(--radix-popover-content-available-height) w-80 flex-col gap-3"
onClick={(e) => e.stopPropagation()}
+ onCloseAutoFocus={(e) => {
+ if (keepFocusOnClose) e.preventDefault();
+ }}
>
<div className="flex items-center justify-between">
<p className="text-sm font-medium">Access Details</p>
@@ -101,7 +115,7 @@ export const GroupAccessPopover = ({ orgId, groups, hasDirectAccess, getRoleName
variant="ghost-muted"
size="2xs"
aria-label="Close"
- onClick={() => setIsOpen(false)}
+ onClick={() => onOpenChange(false)}
>
<XIcon />
</IconButton>
diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
index 94ac00a250..8f05f072d2 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -134,6 +134,7 @@ export const OrgMembersTable = ({
const { mutateAsync: updateOrgMembership } = useUpdateOrgMembership();
const { mutateAsync: addUsersToOrg, isPending: isInviteDirectMemberPending } = useAddUsersToOrg();
const [resendInviteId, setResendInviteId] = useState<string | null>(null);
+ const [openGroupPopoverUserId, setOpenGroupPopoverUserId] = useState<string | null>(null);
const onRoleChange = async (membershipId: string, role: string) => {
if (!currentOrg?.id) return;
@@ -615,6 +616,16 @@ export const OrgMembersTable = ({
groups={groups}
hasDirectAccess={Boolean(membership)}
getRoleName={getRoleName}
+ isOpen={openGroupPopoverUserId === u.id}
+ keepFocusOnClose={
+ openGroupPopoverUserId !== null && openGroupPopoverUserId !== u.id
+ }
+ onOpenChange={(isOpen) =>
+ setOpenGroupPopoverUserId((current) => {
+ if (isOpen) return u.id;
+ return current === u.id ? null : current;
+ })
+ }
/>
) : (
<span className="text-muted">—</span>