Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Add unread states in sidebar menu (#106)

Hakan Shehub1c40697439b
diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsx
index 8bcad934..fb1ea02f 100644
--- a/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsx
+++ b/packages/ui/src/components/layouts/sidebars/sidebar-menu-icon.tsx
@@ -1,20 +1,24 @@
+import { UnreadState } from '@colanode/client/types';
+import { UnreadBadge } from '@colanode/ui/components/ui/unread-badge';
import { cn } from '@colanode/ui/lib/utils';
interface SidebarMenuIconProps {
icon: React.ComponentType<{ className?: string }>;
onClick: () => void;
isActive?: boolean;
+ unreadState?: UnreadState;
}
export const SidebarMenuIcon = ({
icon: Icon,
onClick,
isActive = false,
+ unreadState,
}: SidebarMenuIconProps) => {
return (
<div
className={cn(
- 'w-10 h-10 flex items-center justify-center cursor-pointer hover:bg-gray-200 rounded-md',
+ 'w-10 h-10 flex items-center justify-center cursor-pointer hover:bg-gray-200 rounded-md relative',
isActive ? 'bg-gray-200' : ''
)}
onClick={onClick}
@@ -25,6 +29,11 @@ export const SidebarMenuIcon = ({
isActive ? 'text-primary' : 'text-muted-foreground'
)}
/>
+ <UnreadBadge
+ count={unreadState?.unreadCount ?? 0}
+ unread={unreadState?.hasUnread ?? false}
+ className="absolute top-0 right-0"
+ />
</div>
);
};
diff --git a/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx b/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx
index b0c9048d..effe5b37 100644
--- a/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx
+++ b/packages/ui/src/components/layouts/sidebars/sidebar-menu.tsx
@@ -5,6 +5,8 @@ import { SidebarMenuFooter } from '@colanode/ui/components/layouts/sidebars/side
import { SidebarMenuHeader } from '@colanode/ui/components/layouts/sidebars/sidebar-menu-header';
import { SidebarMenuIcon } from '@colanode/ui/components/layouts/sidebars/sidebar-menu-icon';
import { useApp } from '@colanode/ui/contexts/app';
+import { useRadar } from '@colanode/ui/contexts/radar';
+import { useWorkspace } from '@colanode/ui/contexts/workspace';
interface SidebarMenuProps {
value: SidebarMenuType;
@@ -13,10 +15,19 @@ interface SidebarMenuProps {
export const SidebarMenu = ({ value, onChange }: SidebarMenuProps) => {
const app = useApp();
+ const workspace = useWorkspace();
+ const radar = useRadar();
+
const platform = app.getMetadata('platform');
const windowSize = app.getMetadata('window.size');
const showMacOsPlaceholder = platform === 'darwin' && !windowSize?.fullscreen;
+ const chatsState = radar.getChatsState(workspace.accountId, workspace.id);
+ const channelsState = radar.getChannelsState(
+ workspace.accountId,
+ workspace.id
+ );
+
return (
<div className="flex flex-col h-full w-[65px] min-w-[65px] items-center bg-slate-100">
{showMacOsPlaceholder ? (
@@ -36,6 +47,7 @@ export const SidebarMenu = ({ value, onChange }: SidebarMenuProps) => {
onChange('chats');
}}
isActive={value === 'chats'}
+ unreadState={chatsState}
/>
<SidebarMenuIcon
icon={LayoutGrid}
@@ -43,6 +55,7 @@ export const SidebarMenu = ({ value, onChange }: SidebarMenuProps) => {
onChange('spaces');
}}
isActive={value === 'spaces'}
+ unreadState={channelsState}
/>
</div>
<SidebarMenuFooter />
diff --git a/packages/ui/src/components/radar-provider.tsx b/packages/ui/src/components/radar-provider.tsx
index c4a01cf5..c9554f47 100644
--- a/packages/ui/src/components/radar-provider.tsx
+++ b/packages/ui/src/components/radar-provider.tsx
@@ -1,3 +1,4 @@
+import { getIdType, IdType } from '@colanode/core';
import { RadarContext } from '@colanode/ui/contexts/radar';
import { useQuery } from '@colanode/ui/hooks/use-query';
@@ -68,6 +69,52 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {
unreadCount: 0,
};
},
+ getChatsState: (accountId, workspaceId) => {
+ const workspaceState = radarData[accountId]?.[workspaceId];
+ if (!workspaceState) {
+ return {
+ hasUnread: false,
+ unreadCount: 0,
+ };
+ }
+
+ const chatStates = Object.entries(workspaceState.nodeStates)
+ .filter(([id]) => getIdType(id) === IdType.Chat)
+ .map(([_, nodeState]) => nodeState);
+
+ const hasUnread = chatStates.some((state) => state.hasUnread);
+ const unreadCount = chatStates.reduce((acc, state) => {
+ return acc + state.unreadCount;
+ }, 0);
+
+ return {
+ hasUnread,
+ unreadCount,
+ };
+ },
+ getChannelsState: (accountId, workspaceId) => {
+ const workspaceState = radarData[accountId]?.[workspaceId];
+ if (!workspaceState) {
+ return {
+ hasUnread: false,
+ unreadCount: 0,
+ };
+ }
+
+ const channelStates = Object.entries(workspaceState.nodeStates)
+ .filter(([id]) => getIdType(id) === IdType.Channel)
+ .map(([_, nodeState]) => nodeState);
+
+ const hasUnread = channelStates.some((state) => state.hasUnread);
+ const unreadCount = channelStates.reduce((acc, state) => {
+ return acc + state.unreadCount;
+ }, 0);
+
+ return {
+ hasUnread,
+ unreadCount,
+ };
+ },
markNodeAsSeen: (accountId, workspaceId, nodeId) => {
window.colanode.executeMutation({
type: 'node.interaction.seen',
diff --git a/packages/ui/src/components/ui/unread-badge.tsx b/packages/ui/src/components/ui/unread-badge.tsx
index 0502016f..23102504 100644
--- a/packages/ui/src/components/ui/unread-badge.tsx
+++ b/packages/ui/src/components/ui/unread-badge.tsx
@@ -15,7 +15,7 @@ export const UnreadBadge = ({ count, unread, className }: UnreadBadgeProps) => {
return (
<span
className={cn(
- 'mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white',
+ 'rounded-md px-1.5 py-0.5 text-xs bg-red-400 text-white',
className
)}
>
diff --git a/packages/ui/src/components/workspaces/workspace-create.tsx b/packages/ui/src/components/workspaces/workspace-create.tsx
index 0acacd1f..37deb8fe 100644
--- a/packages/ui/src/components/workspaces/workspace-create.tsx
+++ b/packages/ui/src/components/workspaces/workspace-create.tsx
@@ -17,35 +17,37 @@ export const WorkspaceCreate = ({
const { mutate, isPending } = useMutation();
return (
- <div className="container flex flex-row justify-center">
- <div className="w-full max-w-[700px]">
- <div className="flex flex-row justify-center py-8">
- <h1 className="text-center text-4xl font-bold leading-tight tracking-tighter lg:leading-[1.1]">
- Setup your workspace
- </h1>
+ <div className="flex flex-row justify-center w-full">
+ <div className="container flex flex-row justify-center">
+ <div className="w-full max-w-[700px]">
+ <div className="flex flex-row justify-center py-8">
+ <h1 className="text-center text-4xl font-bold leading-tight tracking-tighter lg:leading-[1.1]">
+ Setup your workspace
+ </h1>
+ </div>
+ <WorkspaceForm
+ onSubmit={(values) => {
+ mutate({
+ input: {
+ type: 'workspace.create',
+ name: values.name,
+ description: values.description,
+ accountId: account.id,
+ avatar: values.avatar ?? null,
+ },
+ onSuccess(output) {
+ onSuccess(output.id);
+ },
+ onError(error) {
+ toast.error(error.message);
+ },
+ });
+ }}
+ isSaving={isPending}
+ onCancel={onCancel}
+ saveText="Create"
+ />
</div>
- <WorkspaceForm
- onSubmit={(values) => {
- mutate({
- input: {
- type: 'workspace.create',
- name: values.name,
- description: values.description,
- accountId: account.id,
- avatar: values.avatar ?? null,
- },
- onSuccess(output) {
- onSuccess(output.id);
- },
- onError(error) {
- toast.error(error.message);
- },
- });
- }}
- isSaving={isPending}
- onCancel={onCancel}
- saveText="Create"
- />
</div>
</div>
);
diff --git a/packages/ui/src/contexts/radar.ts b/packages/ui/src/contexts/radar.ts
index ba9124a1..532d4ccb 100644
--- a/packages/ui/src/contexts/radar.ts
+++ b/packages/ui/src/contexts/radar.ts
@@ -13,6 +13,8 @@ interface RadarContext {
workspaceId: string,
nodeId: string
) => UnreadState;
+ getChatsState: (accountId: string, workspaceId: string) => UnreadState;
+ getChannelsState: (accountId: string, workspaceId: string) => UnreadState;
markNodeAsSeen: (
accountId: string,
workspaceId: string,