Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Show notification badge for other workspaces or accounts
Hakan Shehu5e3efc037c22
diff --git a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-footer.tsx b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-footer.tsxindex d1dc2035..727c4825 100644--- a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-footer.tsx+++ b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-footer.tsx@@ -33,127 +33,137 @@ export function SidebarMenuFooter() {for (const accountItem of otherAccounts) {accountStates[accountItem.id] = radar.getAccountState(accountItem.id);}+ const importantCount = Object.values(accountStates).reduce(+ (acc, curr) => acc + curr.importantCount,+ 0+ );+ const hasUnseenChanges = Object.values(accountStates).some(+ (state) => state.hasUnseenChanges+ );return (- <div className="p-2">- <DropdownMenu open={open} onOpenChange={setOpen}>- <DropdownMenuTrigger asChild>- <button className="flex w-full items-center justify-center">+ <DropdownMenu open={open} onOpenChange={setOpen}>+ <DropdownMenuTrigger asChild>+ <button className="flex w-full items-center justify-center relative mb-2">+ <Avatar+ id={account.id}+ name={account.name}+ avatar={account.avatar}+ className="size-10 rounded-lg shadow-md"+ />+ <NotificationBadge+ count={importantCount}+ unseen={hasUnseenChanges}+ className="absolute -top-1 right-0"+ />+ </button>+ </DropdownMenuTrigger>+ <DropdownMenuContent+ className="w-[--radix-dropdown-menu-trigger-width] min-w-80 rounded-lg"+ side="right"+ align="end"+ sideOffset={4}+ >+ <DropdownMenuItem key={account.id} className="p-0">+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm"><Avatar+ className="h-8 w-8 rounded-lg"id={account.id}name={account.name}avatar={account.avatar}- className="size-10 rounded-lg shadow-md"/>- </button>- </DropdownMenuTrigger>- <DropdownMenuContent- className="w-[--radix-dropdown-menu-trigger-width] min-w-80 rounded-lg"- side="right"- align="end"- sideOffset={4}- >- <DropdownMenuItem key={account.id} className="p-0">- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">- <Avatar- className="h-8 w-8 rounded-lg"- id={account.id}- name={account.name}- avatar={account.avatar}- />- <div className="grid flex-1 text-left text-sm leading-tight">- <span className="truncate font-semibold">{account.name}</span>- <span className="truncate text-xs">{account.email}</span>- </div>+ <div className="grid flex-1 text-left text-sm leading-tight">+ <span className="truncate font-semibold">{account.name}</span>+ <span className="truncate text-xs">{account.email}</span></div>- </DropdownMenuItem>- <DropdownMenuSeparator />- <DropdownMenuItem- className="gap-2 p-2"- onClick={() => {- account.openSettings();- }}- >- <Settings className="size-4" />- <p className="font-medium">Settings</p>- </DropdownMenuItem>- <DropdownMenuItem- className="gap-2 p-2"- onClick={() => {- account.openLogout();- }}- >- <LogOut className="size-4" />- <p className="font-medium">Logout</p>- </DropdownMenuItem>- {otherAccounts.length > 0 && (- <React.Fragment>- <DropdownMenuSeparator />- <DropdownMenuLabel className="mb-1">Accounts</DropdownMenuLabel>- {accounts.map((accountItem) => {- const state = accountStates[accountItem.id] ?? {- importantCount: 0,- hasUnseenChanges: false,- };+ </div>+ </DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ className="gap-2 p-2"+ onClick={() => {+ account.openSettings();+ }}+ >+ <Settings className="size-4" />+ <p className="font-medium">Settings</p>+ </DropdownMenuItem>+ <DropdownMenuItem+ className="gap-2 p-2"+ onClick={() => {+ account.openLogout();+ }}+ >+ <LogOut className="size-4" />+ <p className="font-medium">Logout</p>+ </DropdownMenuItem>+ {otherAccounts.length > 0 && (+ <React.Fragment>+ <DropdownMenuSeparator />+ <DropdownMenuLabel className="mb-1">Accounts</DropdownMenuLabel>+ {accounts.map((accountItem) => {+ const state = accountStates[accountItem.id] ?? {+ importantCount: 0,+ hasUnseenChanges: false,+ };- return (- <DropdownMenuItem- key={accountItem.id}- className="p-0"- onClick={() => {- navigate(`/${accountItem.id}`);+ return (+ <DropdownMenuItem+ key={accountItem.id}+ className="p-0"+ onClick={() => {+ navigate(`/${accountItem.id}`);+ }}+ >+ <AccountContext.Provider+ value={{+ ...accountItem,+ openSettings: () => {},+ openLogout: () => {},}}>- <AccountContext.Provider- value={{- ...accountItem,- openSettings: () => {},- openLogout: () => {},- }}- >- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">- <Avatar- className="h-8 w-8 rounded-lg"- id={accountItem.id}- name={accountItem.name}- avatar={accountItem.avatar}- />- <div className="grid flex-1 text-left text-sm leading-tight">- <span className="truncate font-semibold">- {accountItem.name}- </span>- <span className="truncate text-xs">- {accountItem.email}- </span>- </div>- {accountItem.id === account.id ? (- <Check className="size-4" />- ) : (- <NotificationBadge- count={state.importantCount}- unseen={state.hasUnseenChanges}- />- )}+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">+ <Avatar+ className="h-8 w-8 rounded-lg"+ id={accountItem.id}+ name={accountItem.name}+ avatar={accountItem.avatar}+ />+ <div className="grid flex-1 text-left text-sm leading-tight">+ <span className="truncate font-semibold">+ {accountItem.name}+ </span>+ <span className="truncate text-xs">+ {accountItem.email}+ </span></div>- </AccountContext.Provider>- </DropdownMenuItem>- );- })}- </React.Fragment>- )}+ {accountItem.id === account.id ? (+ <Check className="size-4" />+ ) : (+ <NotificationBadge+ count={state.importantCount}+ unseen={state.hasUnseenChanges}+ />+ )}+ </div>+ </AccountContext.Provider>+ </DropdownMenuItem>+ );+ })}+ </React.Fragment>+ )}- <DropdownMenuSeparator className="my-1" />- <DropdownMenuItem- className="flex items-center gap-2 text-muted-foreground hover:text-foreground"- onClick={() => {- navigate(`/login`);- }}- >- <Plus className="size-4" />- <p className="font-medium">Add account</p>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- </div>+ <DropdownMenuSeparator className="my-1" />+ <DropdownMenuItem+ className="flex items-center gap-2 text-muted-foreground hover:text-foreground"+ onClick={() => {+ navigate(`/login`);+ }}+ >+ <Plus className="size-4" />+ <p className="font-medium">Add account</p>+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>);}diff --git a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-header.tsx b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-header.tsxindex 311eb785..4b847bfc 100644--- a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-header.tsx+++ b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu-header.tsx@@ -31,17 +31,30 @@ export const SidebarMenuHeader = () => {const workspaces = data ?? [];const otherWorkspaces = workspaces.filter((w) => w.id !== workspace.id);+ const otherWorkspaceStates = otherWorkspaces.map((w) =>+ radar.getWorkspaceState(w.accountId, w.id)+ );+ const importantCount = otherWorkspaceStates.reduce(+ (acc, curr) => acc + curr.importantCount,+ 0+ );+ const hasUnseenChanges = otherWorkspaceStates.some((w) => w.hasUnseenChanges);return (<DropdownMenu open={open} onOpenChange={setOpen}><DropdownMenuTrigger asChild>- <button className="flex w-full items-center justify-center">+ <button className="flex w-full items-center justify-center relative"><Avatarid={workspace.id}avatar={workspace.avatar}name={workspace.name}className="size-10 rounded-lg shadow-md"/>+ <NotificationBadge+ count={importantCount}+ unseen={hasUnseenChanges}+ className="absolute -top-1 right-0"+ /></button></DropdownMenuTrigger><DropdownMenuContentdiff --git a/apps/desktop/src/renderer/components/ui/notification-badge.tsx b/apps/desktop/src/renderer/components/ui/notification-badge.tsxindex 3b0bb08d..90a94391 100644--- a/apps/desktop/src/renderer/components/ui/notification-badge.tsx+++ b/apps/desktop/src/renderer/components/ui/notification-badge.tsx@@ -1,11 +1,15 @@+import { cn } from '@/shared/lib/utils';+interface NotificationBadgeProps {count: number;unseen: boolean;+ className?: string;}export const NotificationBadge = ({count,unseen,+ className,}: NotificationBadgeProps) => {if (count === 0 && !unseen) {return null;@@ -13,11 +17,16 @@ export const NotificationBadge = ({if (count > 0) {return (- <span className="mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white">+ <span+ className={cn(+ 'mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white',+ className+ )}+ >{count}</span>);}- return <span className="size-2 rounded-full bg-red-500" />;+ return <span className={cn('size-2 rounded-full bg-red-500', className)} />;};