Commitd30170c

committed

fix: add TooltipProvider to EditRolesButton

1 parentad562be commitd30170cCopy full SHA for d30170c

File tree

+23

-9

lines changed

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

+23

-9

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,17 @@ export const Loading: Story = {`
`43`	`43`	`},`
`44`	`44`	`};`
`45`	`45`
	`46`	`+exportconstCannotSetRoles:Story={`
	`47`	`+args:{`
	`48`	`+userLoginType:"oidc",`
	`49`	`+oidcRoleSync:true,`
	`50`	`+},`
	`51`	`+play:async({ canvasElement})=>{`
	`52`	`+constcanvas=within(canvasElement);`
	`53`	`+awaituserEvent.hover(canvas.getByLabelText("More info"));`
	`54`	`+},`
	`55`	`+};`
	`56`	`+`
`46`	`57`	`exportconstAdvancedOpen:Story={`
`47`	`58`	`args:{`
`48`	`59`	`selectedRoleNames:newSet([MockWorkspaceCreationBanRole.name]),`

Lines changed: 12 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import {`
`16`	`16`	`HelpTooltipTrigger,`
`17`	`17`	`}from"components/HelpTooltip/HelpTooltip";`
`18`	`18`	`import{EditSquare}from"components/Icons/EditSquare";`
	`19`	`+import{TooltipProvider}from"components/Tooltip/Tooltip";`
`19`	`20`	`import{UserIcon}from"lucide-react";`
`20`	`21`	`import{typeFC,useEffect,useState}from"react";`
`21`	`22`
`@@ -82,15 +83,17 @@ export const EditRolesButton: FC<EditRolesButtonProps> = (props) => {`
`82`	`83`
`83`	`84`	`if(!canSetRoles){`
`84`	`85`	`return(`
`85`		`-<HelpTooltip>`
`86`		`-<HelpTooltipTriggersize="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`	`+<HelpTooltipTriggersize="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>`
`94`	`97`	`);`
`95`	`98`	`}`
`96`	`99`

Comments

(0)