Skip to content

Commit d30170c

Browse files
committed
fix: add TooltipProvider to EditRolesButton
1 parent ad562be commit d30170c

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.stories.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,17 @@ export const Loading: Story = {
4343
},
4444
};
4545

46+
export const CannotSetRoles: Story = {
47+
args: {
48+
userLoginType: "oidc",
49+
oidcRoleSync: true,
50+
},
51+
play: async ({ canvasElement }) => {
52+
const canvas = within(canvasElement);
53+
await userEvent.hover(canvas.getByLabelText("More info"));
54+
},
55+
};
56+
4657
export const AdvancedOpen: Story = {
4758
args: {
4859
selectedRoleNames: new Set([MockWorkspaceCreationBanRole.name]),

site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
HelpTooltipTrigger,
1717
} from "components/HelpTooltip/HelpTooltip";
1818
import { EditSquare } from "components/Icons/EditSquare";
19+
import { TooltipProvider } from "components/Tooltip/Tooltip";
1920
import { UserIcon } from "lucide-react";
2021
import { type FC, useEffect, useState } from "react";
2122

@@ -82,15 +83,17 @@ export const EditRolesButton: FC<EditRolesButtonProps> = (props) => {
8283

8384
if (!canSetRoles) {
8485
return (
85-
<HelpTooltip>
86-
<HelpTooltipTrigger size="small" />
87-
<HelpTooltipContent>
88-
<HelpTooltipTitle>Externally controlled</HelpTooltipTitle>
89-
<HelpTooltipText>
90-
Roles for this user are controlled by the OIDC identity provider.
91-
</HelpTooltipText>
92-
</HelpTooltipContent>
93-
</HelpTooltip>
86+
<TooltipProvider>
87+
<HelpTooltip>
88+
<HelpTooltipTrigger size="small" />
89+
<HelpTooltipContent>
90+
<HelpTooltipTitle>Externally controlled</HelpTooltipTitle>
91+
<HelpTooltipText>
92+
Roles for this user are controlled by the OIDC identity provider.
93+
</HelpTooltipText>
94+
</HelpTooltipContent>
95+
</HelpTooltip>
96+
</TooltipProvider>
9497
);
9598
}
9699

0 commit comments

Comments
 (0)