Skip to content

Commit 2e3cace

Browse files
authored
omar/eng-67-invite-modal-if-no-teams-disable-add-user-to-team (#602)
1 parent 9e880bd commit 2e3cace

File tree

3 files changed

+48
-35
lines changed

3 files changed

+48
-35
lines changed

apps/web/src/app/[orgShortcode]/settings/org/users/invites/_components/invite-modal.tsx

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ import {
3535
FormItem,
3636
FormMessage
3737
} from '@/src/components/shadcn-ui/form';
38+
import {
39+
Tooltip,
40+
TooltipContent,
41+
TooltipTrigger
42+
} from '@/src/components/shadcn-ui/tooltip';
3843

3944
const inviteFormSchema = z.object({
4045
firstName: z.string().min(1).max(64),
@@ -384,10 +389,25 @@ export function InviteModal() {
384389
Add User to Teams
385390
</div>
386391
<FormControl>
387-
<Switch
388-
checked={field.value}
389-
onCheckedChange={field.onChange}
390-
/>
392+
{orgTeams?.teams && orgTeams?.teams?.length > 0 ? (
393+
<Switch
394+
checked={field.value}
395+
onCheckedChange={field.onChange}
396+
/>
397+
) : (
398+
<Tooltip>
399+
<TooltipTrigger>
400+
<Switch
401+
disabled
402+
checked={field.value}
403+
onCheckedChange={field.onChange}
404+
/>
405+
</TooltipTrigger>
406+
<TooltipContent>
407+
<p>{`You don't have any teams`}</p>
408+
</TooltipContent>
409+
</Tooltip>
410+
)}
391411
</FormControl>
392412
<FormMessage />
393413
</FormItem>

apps/web/src/components/avatar.tsx

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ import * as React from 'react';
44
import { cva, type VariantProps } from 'class-variance-authority';
55
import { cn, generateAvatarUrl, getInitials } from '@/src/lib/utils';
66
import { type TypeId, inferTypeId } from '@u22n/utils/typeid';
7-
import {
8-
Tooltip,
9-
TooltipContent,
10-
TooltipProvider,
11-
TooltipTrigger
12-
} from './shadcn-ui/tooltip';
7+
import { Tooltip, TooltipContent, TooltipTrigger } from './shadcn-ui/tooltip';
138
import {
149
Avatar as AvatarShad,
1510
AvatarFallback,
@@ -100,31 +95,29 @@ export function Avatar(props: AvatarProps) {
10095
</AvatarShad>
10196
</div>
10297
) : (
103-
<TooltipProvider>
104-
<Tooltip>
105-
<TooltipTrigger className="w-fit">
106-
<AvatarShad
107-
className={avatarVariants({
108-
color: props.color,
109-
size: props.size
110-
})}>
111-
<AvatarImage
112-
src={avatarUrl}
113-
alt={altText}
114-
/>
115-
<AvatarFallback>{getInitials(altText)}</AvatarFallback>
116-
</AvatarShad>
117-
</TooltipTrigger>
118-
<TooltipContent className="flex flex-col gap-1">
119-
{altText}
120-
<AvatarIcon
121-
avatarProfilePublicId={props.avatarProfilePublicId}
122-
size="xs"
123-
withDot
98+
<Tooltip>
99+
<TooltipTrigger className="w-fit">
100+
<AvatarShad
101+
className={avatarVariants({
102+
color: props.color,
103+
size: props.size
104+
})}>
105+
<AvatarImage
106+
src={avatarUrl}
107+
alt={altText}
124108
/>
125-
</TooltipContent>
126-
</Tooltip>
127-
</TooltipProvider>
109+
<AvatarFallback>{getInitials(altText)}</AvatarFallback>
110+
</AvatarShad>
111+
</TooltipTrigger>
112+
<TooltipContent className="flex flex-col gap-1">
113+
{altText}
114+
<AvatarIcon
115+
avatarProfilePublicId={props.avatarProfilePublicId}
116+
size="xs"
117+
withDot
118+
/>
119+
</TooltipContent>
120+
</Tooltip>
128121
);
129122
}
130123

apps/web/src/components/shadcn-ui/tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const TooltipContent = React.forwardRef<
1818
ref={ref}
1919
sideOffset={sideOffset}
2020
className={cn(
21-
'bg-base-12 text-base-1 animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 overflow-hidden rounded-md px-3 py-1.5 text-xs',
21+
'bg-base-12 text-base-1 animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-[5000] overflow-hidden rounded-md px-3 py-1.5 text-xs',
2222
className
2323
)}
2424
{...props}

0 commit comments

Comments
 (0)