Skip to content

feat: add indicator when there are pending invitations #2146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonrivera merged 4 commits into from
Aug 19, 2025
+35 −17
Merged

feat: add indicator when there are pending invitations #2146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b22384
feat: add indicator when there are pending invitations
wilsonrivera Aug 15, 2025
6d2059e
chore: show indicator only when there are some invitations
wilsonrivera Aug 15, 2025
b211ed0
chore: add aria-hidden
wilsonrivera Aug 15, 2025
70c46f2
Merge branch 'main' into wilson/eng-7615-indicate-that-the-user-has-p…
wilsonrivera Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion studio/src/components/layout/dashboard-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,20 @@ export const DashboardLayout = ({ children }: LayoutProps) => {
title: "Account",
},
{
title: "Invitations",
title: (
<>
Invitations
{user?.invitations?.length ? (
<div className="relative ml-auto">
<div aria-hidden="true" className="absolute h-2 w-2 animate-ping rounded-full bg-blue-400" />
<div aria-hidden="true" className="h-2 w-2 rounded-full bg-blue-400" />
</div>
) : null}
</>
),
href: "/account/invitations",
icon: <EnvelopeClosedIcon className="size-4" />,
className: 'flex justify-between items-center w-full gap-x-1',
},
{
title: "Manage",
Expand All @@ -265,6 +276,7 @@ export const DashboardLayout = ({ children }: LayoutProps) => {
user?.currentOrganization.slug,
isAdmin,
isAdminOrDeveloper,
user?.invitations,
]);

return (
Expand Down
29 changes: 17 additions & 12 deletions studio/src/components/layout/sidenav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,13 @@ import { cn } from "@/lib/utils";
import {
CaretSortIcon,
Cross2Icon,
EnvelopeClosedIcon,
HamburgerMenuIcon,
} from "@radix-ui/react-icons";
import Link from "next/link";
import { useRouter } from "next/router";
import { ReactNode, useContext, useMemo, useState } from "react";
import { ReactNode, useContext, useState } from "react";
import { UserContext } from "../app-provider";
import { Logo } from "../logo";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "../ui/select";
import { Separator } from "../ui/separator";
import { UserMenu, UserMenuMobile } from "../user-menu";
import { LayoutProps } from "./layout";
Expand All @@ -36,7 +28,8 @@ import {
} from "../ui/dropdown-menu";

export type NavLink = {
title: string;
title: ReactNode;
className?: string;
href: string;
matchExact?: boolean;
icon: ReactNode;
Expand All @@ -48,6 +41,7 @@ const isActive = (path: string, currentPath: string, exact = true) => {
};

const MobileNav = () => {
const user = useUser();
return (
<div
className={cn(
Expand All @@ -56,7 +50,18 @@ const MobileNav = () => {
>
<div className="relative z-20 grid gap-6 rounded-md p-4 text-popover-foreground">
<nav className="grid grid-flow-row auto-rows-max items-center justify-center space-y-2 text-center text-sm">
<Link href="/account/invitations">Invitations</Link>
<Link
href="/account/invitations"
className="flex justify-center items-center gap-x-2"
>
Invitations
{user?.invitations?.length && (
<div className="relative">
<div aria-hidden="true" className="absolute h-2 w-2 animate-ping rounded-full bg-blue-400" />
<div aria-hidden="true" className="h-2 w-2 rounded-full bg-blue-400" />
</div>
)}
</Link>

<Link
href={docsBaseURL}
Expand Down Expand Up @@ -205,7 +210,7 @@ export const SideNav = (props: SideNavLayoutProps) => {
>
{item.icon}

<span className="whitespace-nowrap">{item.title}</span>
<span className={cn("whitespace-nowrap", item.className)}>{item.title}</span>
</Link>
) : (
<h4 className="hidden px-3 py-2 text-sm text-muted-foreground lg:block">
Expand Down
9 changes: 5 additions & 4 deletions studio/src/components/user-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ export const UserMenu = () => {
</AvatarFallback>
</Avatar>
{hasInvitations ? (
<div className="absolute right-0 top-0 -translate-x-0.5 -translate-y-0.5 rounded-full border-2 border-background">
<div className="h-2 w-2 rounded-full bg-blue-400" />
<div className="absolute right-0 top-0 -translate-x-0.5 -translate-y-0.5 rounded-full border-2 border-background pointer-events-none">
<div className="absolute size-2 animate-ping rounded-full bg-blue-400" />
<div className="size-2 rounded-full bg-blue-400" />
</div>
) : null}
</div>
Expand All @@ -67,8 +68,8 @@ export const UserMenu = () => {
Invitations
{hasInvitations ? (
<div className="relative ml-auto">
<div className="absolute h-2 w-2 animate-ping rounded-full bg-blue-400" />
<div className="h-2 w-2 rounded-full bg-blue-400" />
<div className="absolute size-2 animate-ping rounded-full bg-blue-400" />
<div className="size-2 rounded-full bg-blue-400" />
</div>
) : null}
</DropdownMenuItem>
Expand Down
Loading