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
Improve notification badge
Hakan Shehue61c2bbf71b6
diff --git a/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx b/apps/desktop/src/renderer/components/channels/channel-container-tab.tsxindex 032e90c4..26e936b6 100644--- a/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx@@ -3,15 +3,20 @@ import { ChannelEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';+import { useRadar } from '@/renderer/contexts/radar';+import { NotificationBadge } from '@/renderer/components/ui/notification-badge';interface ChannelContainerTabProps {channelId: string;+ isActive: boolean;}export const ChannelContainerTab = ({channelId,+ isActive,}: ChannelContainerTabProps) => {const workspace = useWorkspace();+ const radar = useRadar();const { data, isPending } = useQuery({type: 'entry_get',@@ -34,6 +39,14 @@ export const ChannelContainerTab = ({? channel.attributes.name: 'Unnamed';+ const channelState = radar.getChannelState(+ workspace.accountId,+ workspace.id,+ channel.id+ );+ const unreadCount = channelState.unseenMessagesCount;+ const mentionsCount = channelState.mentionsCount;+return (<div className="flex items-center space-x-2"><Avatar@@ -43,6 +56,9 @@ export const ChannelContainerTab = ({avatar={channel.attributes.avatar}/><span>{name}</span>+ {!isActive && (+ <NotificationBadge count={mentionsCount} unseen={unreadCount > 0} />+ )}</div>);};diff --git a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsxindex d04c0f6f..d854b845 100644--- a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx@@ -2,7 +2,7 @@ import { ChannelEntry } from '@colanode/core';import { InView } from 'react-intersection-observer';import { Avatar } from '@/renderer/components/avatars/avatar';-import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { NotificationBadge } from '@/renderer/components/ui/notification-badge';import { useRadar } from '@/renderer/contexts/radar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useLayout } from '@/renderer/contexts/layout';@@ -54,10 +54,7 @@ export const ChannelSidebarItem = ({ channel }: ChannelSidebarItemProps) => {{channel.attributes.name ?? 'Unnamed'}</span>{!isActive && (- <ReadStateIndicator- count={mentionsCount}- hasChanges={unreadCount > 0}- />+ <NotificationBadge count={mentionsCount} unseen={unreadCount > 0} />)}</InView>);diff --git a/apps/desktop/src/renderer/components/chats/chat-container-tab.tsx b/apps/desktop/src/renderer/components/chats/chat-container-tab.tsxindex 71027b91..11084d86 100644--- a/apps/desktop/src/renderer/components/chats/chat-container-tab.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-container-tab.tsx@@ -1,15 +1,22 @@import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';+import { useRadar } from '@/renderer/contexts/radar';+import { NotificationBadge } from '@/renderer/components/ui/notification-badge';interface ChatContainerTabProps {chatId: string;+ isActive: boolean;}-export const ChatContainerTab = ({ chatId }: ChatContainerTabProps) => {+export const ChatContainerTab = ({+ chatId,+ isActive,+}: ChatContainerTabProps) => {const workspace = useWorkspace();+ const radar = useRadar();- const { data: chat } = useQuery({+ const { data: chat, isPending: isChatPending } = useQuery({type: 'entry_get',entryId: chatId,accountId: workspace.accountId,@@ -23,21 +30,36 @@ export const ChatContainerTab = ({ chatId }: ChatContainerTabProps) => {) ?? ''): '';- const { data: user } = useQuery({+ const { data: user, isPending: isUserPending } = useQuery({type: 'user_get',accountId: workspace.accountId,workspaceId: workspace.id,userId,});+ if (isChatPending || isUserPending) {+ return <p className="text-sm text-muted-foreground">Loading...</p>;+ }+if (!chat || !user) {- return <p>Not found</p>;+ return <p className="text-sm text-muted-foreground">Not found</p>;}+ const chatState = radar.getChatState(+ workspace.accountId,+ workspace.id,+ chat.id+ );+ const unreadCount = chatState.unseenMessagesCount;+ const mentionsCount = chatState.mentionsCount;+return (<div className="flex items-center space-x-2"><Avatar size="small" id={user.id} name={user.name} avatar={user.avatar} /><span>{user.name}</span>+ {!isActive && (+ <NotificationBadge count={mentionsCount} unseen={unreadCount > 0} />+ )}</div>);};diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsxindex 80c5c0e2..74f6a5eb 100644--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx@@ -2,7 +2,7 @@ import { ChatEntry } from '@colanode/core';import { InView } from 'react-intersection-observer';import { Avatar } from '@/renderer/components/avatars/avatar';-import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { NotificationBadge } from '@/renderer/components/ui/notification-badge';import { useRadar } from '@/renderer/contexts/radar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';@@ -71,7 +71,7 @@ export const ChatSidebarItem = ({ chat }: ChatSidebarItemProps) => {{data.name ?? 'Unnamed'}</span>{!isActive && (- <ReadStateIndicator count={unreadCount} hasChanges={unreadCount > 0} />+ <NotificationBadge count={unreadCount} unseen={unreadCount > 0} />)}</InView>);diff --git a/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx b/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsxindex 9fae5373..727eea61 100644--- a/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx+++ b/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx@@ -11,8 +11,6 @@ interface DatabaseSidebarItemProps {export const DatabaseSidebarItem = ({ database }: DatabaseSidebarItemProps) => {const layout = useLayout();const isActive = layout.activeTab === database.id;- const isUnread = false;- const mentionsCount = 0;return (<button@@ -28,22 +26,9 @@ export const DatabaseSidebarItem = ({ database }: DatabaseSidebarItemProps) => {name={database.attributes.name}className="h-4 w-4"/>- <span- className={cn(- 'line-clamp-1 w-full flex-grow pl-2 text-left',- isUnread && 'font-bold'- )}- >+ <span className={cn('line-clamp-1 w-full flex-grow pl-2 text-left')}>{database.attributes.name ?? 'Unnamed'}</span>- {mentionsCount > 0 && (- <span className="mr-1 rounded-md bg-sidebar-accent px-1 py-0.5 text-xs text-sidebar-accent-foreground">- {mentionsCount}- </span>- )}- {mentionsCount == 0 && isUnread && (- <span className="size-2 rounded-full bg-red-500" />- )}</button>);};diff --git a/apps/desktop/src/renderer/components/layouts/containers/container-tab-trigger.tsx b/apps/desktop/src/renderer/components/layouts/containers/container-tab-trigger.tsxindex aef36bd6..662c995e 100644--- a/apps/desktop/src/renderer/components/layouts/containers/container-tab-trigger.tsx+++ b/apps/desktop/src/renderer/components/layouts/containers/container-tab-trigger.tsx@@ -81,14 +81,22 @@ export const ContainerTabTrigger = ({{match(getIdType(tab.path)).with(IdType.Space, () => <SpaceContainerTab spaceId={tab.path} />).with(IdType.Channel, () => (- <ChannelContainerTab channelId={tab.path} />+ <ChannelContainerTab+ channelId={tab.path}+ isActive={tab.active ?? false}+ />)).with(IdType.Page, () => <PageContainerTab pageId={tab.path} />).with(IdType.Database, () => (<DatabaseContainerTab databaseId={tab.path} />)).with(IdType.Record, () => <RecordContainerTab recordId={tab.path} />)- .with(IdType.Chat, () => <ChatContainerTab chatId={tab.path} />)+ .with(IdType.Chat, () => (+ <ChatContainerTab+ chatId={tab.path}+ isActive={tab.active ?? false}+ />+ )).with(IdType.Folder, () => <FolderContainerTab folderId={tab.path} />).with(IdType.File, () => <FileContainerTab fileId={tab.path} />).otherwise(() => null)}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 e0b01d31..d1dc2035 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@@ -3,7 +3,7 @@ import React from 'react';import { useNavigate } from 'react-router-dom';import { Avatar } from '@/renderer/components/avatars/avatar';-import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { NotificationBadge } from '@/renderer/components/ui/notification-badge';import {DropdownMenu,DropdownMenuContent,@@ -129,9 +129,9 @@ export function SidebarMenuFooter() {{accountItem.id === account.id ? (<Check className="size-4" />) : (- <ReadStateIndicator+ <NotificationBadgecount={state.importantCount}- hasChanges={state.hasUnseenChanges}+ unseen={state.hasUnseenChanges}/>)}</div>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 1cfe2c05..311eb785 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@@ -3,7 +3,7 @@ import React from 'react';import { useNavigate } from 'react-router-dom';import { Avatar } from '@/renderer/components/avatars/avatar';-import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { NotificationBadge } from '@/renderer/components/ui/notification-badge';import {DropdownMenu,DropdownMenuContent,@@ -107,9 +107,9 @@ export const SidebarMenuHeader = () => {{workspaceItem.id === workspace.id ? (<Check className="size-4" />) : (- <ReadStateIndicator+ <NotificationBadgecount={workspaceState.importantCount}- hasChanges={workspaceState.hasUnseenChanges}+ unseen={workspaceState.hasUnseenChanges}/>)}</div>diff --git a/apps/desktop/src/renderer/components/layouts/read-state-indicator.tsx b/apps/desktop/src/renderer/components/ui/notification-badge.tsxsimilarity index 60%rename from apps/desktop/src/renderer/components/layouts/read-state-indicator.tsxrename to apps/desktop/src/renderer/components/ui/notification-badge.tsxindex 805910d8..3b0bb08d 100644--- a/apps/desktop/src/renderer/components/layouts/read-state-indicator.tsx+++ b/apps/desktop/src/renderer/components/ui/notification-badge.tsx@@ -1,13 +1,13 @@-interface ReadStateIndicatorProps {+interface NotificationBadgeProps {count: number;- hasChanges: boolean;+ unseen: boolean;}-export const ReadStateIndicator = ({+export const NotificationBadge = ({count,- hasChanges,-}: ReadStateIndicatorProps) => {- if (count === 0 && !hasChanges) {+ unseen,+}: NotificationBadgeProps) => {+ if (count === 0 && !unseen) {return null;}