Skip to content

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

Show read states in sidebar header

Hakan Shehubb78a238a8a1
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts b/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
index 3ac9d74a..986f2b82 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
@@ -57,6 +57,7 @@ export class WorkspaceUsersInviteMutationHandler
`/v1/workspaces/${workspace.workspace_id}/users`,
{
emails: input.emails,
+ role: input.role,
},
{
serverDomain: server.domain,
diff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.ts
index a7cdd527..8c6d869a 100644
--- a/apps/desktop/src/main/services/radar-service.ts
+++ b/apps/desktop/src/main/services/radar-service.ts
@@ -68,7 +68,7 @@ class RadarService {
}
if (messagesCount > 0) {
- workspaceState.hasUnseenChanges = true;
+ workspaceState.importantCount += messagesCount;
}
} else if (idType === IdType.Channel) {
workspaceState.nodeStates[nodeId] = {
@@ -79,9 +79,9 @@ class RadarService {
};
if (messagesCount > 0) {
- workspaceState.importantCount += messagesCount;
+ workspaceState.hasUnseenChanges = true;
} else if (mentionsCount > 0) {
- workspaceState.importantCount += mentionsCount;
+ workspaceState.importantCount += messagesCount;
}
}
}
diff --git a/apps/desktop/src/renderer/app.tsx b/apps/desktop/src/renderer/app.tsx
index 993d905f..c62fccc8 100644
--- a/apps/desktop/src/renderer/app.tsx
+++ b/apps/desktop/src/renderer/app.tsx
@@ -8,11 +8,17 @@ import { AccountProvider } from '@/renderer/components/accounts/account-provider
import { AccountLogout } from '@/renderer/components/accounts/account-logout';
import { AccountSettingsDialog } from '@/renderer/components/accounts/account-settings-dialog';
import { RadarProvider } from '@/renderer/radar-provider';
+import { WorkspaceSettingsDialog } from '@/renderer/components/workspaces/workspace-settings-dialog';
export const App = () => {
const navigate = useNavigate();
const [logoutId, setLogoutId] = React.useState<string | null>(null);
- const [settingsId, setSettingsId] = React.useState<string | null>(null);
+ const [accountSettingsId, setSettingsId] = React.useState<string | null>(
+ null
+ );
+ const [workspaceSettingsId, setWorkspaceSettingsId] = React.useState<
+ string | null
+ >(null);
const { data: servers, isPending: isPendingServers } = useQuery({
type: 'server_list',
@@ -67,6 +73,9 @@ export const App = () => {
navigate(`/${accountWorkspaces[0].userId}`);
},
+ showWorkspaceSettings: (id) => {
+ setWorkspaceSettingsId(id);
+ },
}}
>
<RadarProvider>
@@ -98,13 +107,20 @@ export const App = () => {
}}
/>
)}
- {settingsId && (
+ {accountSettingsId && (
<AccountSettingsDialog
- id={settingsId}
+ id={accountSettingsId}
open={true}
onOpenChange={() => setSettingsId(null)}
/>
)}
+ {workspaceSettingsId && (
+ <WorkspaceSettingsDialog
+ id={workspaceSettingsId}
+ open={true}
+ onOpenChange={() => setWorkspaceSettingsId(null)}
+ />
+ )}
</AppContext.Provider>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
index 45b1de87..adcae6a0 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
@@ -24,12 +24,12 @@ import { ChevronsUpDown, LogOut, Plus, Settings } from 'lucide-react';
import { useApp } from '@/renderer/contexts/app';
export function LayoutSidebarFooter() {
- const [open, setOpen] = React.useState(false);
-
const app = useApp();
const account = useAccount();
const sidebar = useSidebar();
+ const [open, setOpen] = React.useState(false);
+
return (
<SidebarMenu>
<SidebarMenuItem>
@@ -123,7 +123,7 @@ export function LayoutSidebarFooter() {
}}
>
<Plus className="size-4" />
- Add account
+ <p className="font-medium">Add account</p>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
index 4f7e0fb3..f856d66f 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { Avatar } from '@/renderer/components/avatars/avatar';
import { useAccount } from '@/renderer/contexts/account';
@@ -16,18 +17,60 @@ import {
SidebarMenuItem,
useSidebar,
} from '@/renderer/components/ui/sidebar';
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from '@/renderer/components/ui/tooltip';
import { ChevronsUpDown, Settings, Plus } from 'lucide-react';
+import { useRadar } from '@/renderer/contexts/radar';
+import { useApp } from '@/renderer/contexts/app';
+
+interface WorkspaceStateIndicatorProps {
+ importantCount: number;
+ hasUnseenChanges: boolean;
+}
+
+const WorkspaceStateIndicator = ({
+ importantCount,
+ hasUnseenChanges,
+}: WorkspaceStateIndicatorProps) => {
+ return (
+ <React.Fragment>
+ {importantCount > 0 && (
+ <span className="mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white">
+ {importantCount}
+ </span>
+ )}
+ {importantCount === 0 && hasUnseenChanges && (
+ <span className="size-2 rounded-full bg-red-500" />
+ )}
+ </React.Fragment>
+ );
+};
export const LayoutSidebarHeader = () => {
+ const app = useApp();
const workspace = useWorkspace();
const account = useAccount();
const navigate = useNavigate();
const sidebar = useSidebar();
+ const radar = useRadar();
+
+ const [open, setOpen] = React.useState(false);
+ const otherWorkspaceStates = account.workspaces
+ .filter((w) => w.id !== workspace.id)
+ .map((w) => radar.getWorkspaceState(w.userId));
+ const importantCount = otherWorkspaceStates.reduce(
+ (acc, curr) => acc + curr.importantCount,
+ 0
+ );
+ const hasUnseenChanges = otherWorkspaceStates.some((w) => w.hasUnseenChanges);
return (
<SidebarMenu>
<SidebarMenuItem>
- <DropdownMenu>
+ <DropdownMenu open={open} onOpenChange={setOpen}>
<DropdownMenuTrigger asChild>
<SidebarMenuButton
size="lg"
@@ -46,45 +89,70 @@ export const LayoutSidebarHeader = () => {
<span className="truncate text-xs">Free Plan</span>
</div>
<ChevronsUpDown className="ml-auto size-4" />
+ <WorkspaceStateIndicator
+ importantCount={importantCount}
+ hasUnseenChanges={hasUnseenChanges}
+ />
</SidebarMenuButton>
</DropdownMenuTrigger>
<DropdownMenuContent
- className="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg"
+ className="w-[--radix-dropdown-menu-trigger-width] min-w-80 rounded-lg"
align="start"
side={sidebar.isMobile ? 'bottom' : 'right'}
sideOffset={4}
>
- <DropdownMenuItem
- className="gap-2 p-2 text-muted-foreground"
- onClick={() => {
- workspace.openSettings();
- }}
- >
- <Settings className="size-4" />
- <p className="font-medium">Settings</p>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuLabel className="text-xs text-muted-foreground">
- Workspaces
- </DropdownMenuLabel>
- {account.workspaces.map((workspace) => (
- <DropdownMenuItem
- key={workspace.id}
- onClick={() => {
- navigate(`/${workspace.userId}`);
- }}
- className="gap-2 p-2"
- >
- <Avatar
- id={workspace.id}
- avatar={workspace.avatar}
- name={workspace.name}
- size="small"
- />
- {workspace.name}
- </DropdownMenuItem>
- ))}
- <DropdownMenuSeparator />
+ <DropdownMenuLabel className="mb-1">Workspace</DropdownMenuLabel>
+ {account.workspaces.map((workspaceItem) => {
+ const workspaceState = radar.getWorkspaceState(
+ workspaceItem.userId
+ );
+ return (
+ <DropdownMenuItem
+ key={workspaceItem.id}
+ className="p-0"
+ onClick={() => {
+ navigate(`/${workspaceItem.userId}`);
+ }}
+ >
+ <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={workspaceItem.id}
+ name={workspaceItem.name}
+ avatar={workspaceItem.avatar}
+ />
+ <div className="grid flex-1 text-left text-sm leading-tight">
+ <span className="truncate font-semibold">
+ {workspaceItem.name}
+ </span>
+ <span className="truncate text-xs">Free plan</span>
+ </div>
+ <div className="ml-auto flex items-center gap-2 text-muted-foreground mr-1">
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Settings
+ className="size-4 hover:cursor-pointer hover:text-sidebar-accent-foreground"
+ onClick={(e) => {
+ e.stopPropagation();
+ app.showWorkspaceSettings(workspaceItem.id);
+ setOpen(false);
+ }}
+ />
+ </TooltipTrigger>
+ <TooltipContent className="flex flex-row items-center gap-2">
+ Settings
+ </TooltipContent>
+ </Tooltip>
+ </div>
+ <WorkspaceStateIndicator
+ importantCount={workspaceState.importantCount}
+ hasUnseenChanges={workspaceState.hasUnseenChanges}
+ />
+ </div>
+ </DropdownMenuItem>
+ );
+ })}
+ <DropdownMenuSeparator className="my-1" />
<DropdownMenuItem
className="gap-2 p-2 text-muted-foreground"
onClick={() => {
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx
index d7bc7413..d12ef741 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx
@@ -16,27 +16,34 @@ import {
SidebarHeader,
} from '@/renderer/components/ui/sidebar';
import { Avatar } from '@/renderer/components/avatars/avatar';
-import { useWorkspace } from '@/renderer/contexts/workspace';
import { WorkspaceUpdate } from '@/renderer/components/workspaces/workspace-update';
import { WorkspaceUsers } from '@/renderer/components/workspaces/workspace-users';
import { VisuallyHidden } from '@radix-ui/react-visually-hidden';
import { Info, Trash2, Users } from 'lucide-react';
import { match } from 'ts-pattern';
+import { useApp } from '@/renderer/contexts/app';
interface WorkspaceSettingsDialogProps {
+ id: string;
open: boolean;
onOpenChange: (open: boolean) => void;
}
export const WorkspaceSettingsDialog = ({
+ id,
open,
onOpenChange,
}: WorkspaceSettingsDialogProps) => {
- const workspace = useWorkspace();
+ const app = useApp();
const [tab, setTab] = React.useState<'info' | 'users' | 'delete'>('info');
- const canDelete = workspace.role === 'owner';
+ const workspace = app.workspaces.find((w) => w.id === id);
+
+ if (!workspace) {
+ return null;
+ }
+ const canDelete = workspace.role === 'owner';
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent
@@ -107,8 +114,8 @@ export const WorkspaceSettingsDialog = ({
</Sidebar>
<div className="flex-1 overflow-auto p-7">
{match(tab)
- .with('info', () => <WorkspaceUpdate />)
- .with('users', () => <WorkspaceUsers />)
+ .with('info', () => <WorkspaceUpdate workspace={workspace} />)
+ .with('users', () => <WorkspaceUsers workspace={workspace} />)
.with('delete', () => <p>Coming soon.</p>)
.exhaustive()}
</div>
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-update.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-update.tsx
index 7c0533d4..dae41905 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-update.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-update.tsx
@@ -1,10 +1,13 @@
import { toast } from '@/renderer/hooks/use-toast';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { useWorkspace } from '@/renderer/contexts/workspace';
import { WorkspaceForm } from './workspace-form';
+import { Workspace } from '@/shared/types/workspaces';
-export const WorkspaceUpdate = () => {
- const workspace = useWorkspace();
+interface WorkspaceUpdateProps {
+ workspace: Workspace;
+}
+
+export const WorkspaceUpdate = ({ workspace }: WorkspaceUpdateProps) => {
const { mutate, isPending } = useMutation();
const canEdit = workspace.role === 'owner';
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
index d1338e5f..84b7df0f 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
@@ -4,11 +4,16 @@ import { Button } from '@/renderer/components/ui/button';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { Spinner } from '@/renderer/components/ui/spinner';
import { toast } from '@/renderer/hooks/use-toast';
-import { useWorkspace } from '@/renderer/contexts/workspace';
import { X } from 'lucide-react';
+import { Workspace } from '@/shared/types/workspaces';
-export const WorkspaceUserInvite = () => {
- const workspace = useWorkspace();
+interface WorkspaceUserInviteProps {
+ workspace: Workspace;
+}
+
+export const WorkspaceUserInvite = ({
+ workspace,
+}: WorkspaceUserInviteProps) => {
const { mutate, isPending } = useMutation();
const [input, setInput] = React.useState('');
@@ -79,6 +84,7 @@ export const WorkspaceUserInvite = () => {
type: 'workspace_users_invite',
emails: emails,
userId: workspace.userId,
+ role: 'collaborator',
},
onSuccess() {
setEmails([]);
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
index 7e32bc5a..badc5063 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
@@ -8,8 +8,8 @@ import { WorkspaceRole } from '@colanode/core';
import { Spinner } from '@/renderer/components/ui/spinner';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
-import { useWorkspace } from '@/renderer/contexts/workspace';
import { Check, ChevronDown } from 'lucide-react';
+import { Workspace } from '@/shared/types/workspaces';
interface WorkspaceRoleItem {
name: string;
@@ -52,19 +52,19 @@ const roles: WorkspaceRoleItem[] = [
];
interface WorkspaceUserRoleDropdownProps {
+ workspace: Workspace;
userId: string;
value: WorkspaceRole;
canEdit: boolean;
}
export const WorkspaceUserRoleDropdown = ({
+ workspace,
userId,
value,
canEdit,
}: WorkspaceUserRoleDropdownProps) => {
- const workspace = useWorkspace();
const { mutate, isPending } = useMutation();
-
const currentRole = roles.find((role) => role.value === value);
if (!canEdit) {
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
index 8164ffaa..ef1a8853 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx
@@ -7,13 +7,16 @@ import { Spinner } from '@/renderer/components/ui/spinner';
import { InView } from 'react-intersection-observer';
import { WorkspaceUserRoleDropdown } from '@/renderer/components/workspaces/workspace-user-role-dropdown';
import { WorkspaceRole } from '@colanode/core';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { WorkspaceUserListQueryInput } from '../../../shared/queries/workspace-user-list';
+import { WorkspaceUserListQueryInput } from '@/shared/queries/workspace-user-list';
+import { Workspace } from '@/shared/types/workspaces';
const USERS_PER_PAGE = 50;
-export const WorkspaceUsers = () => {
- const workspace = useWorkspace();
+interface WorkspaceUsersProps {
+ workspace: Workspace;
+}
+
+export const WorkspaceUsers = ({ workspace }: WorkspaceUsersProps) => {
const canEditUsers = workspace.role === 'owner' || workspace.role === 'admin';
const [lastPage, setLastPage] = React.useState<number>(1);
@@ -35,7 +38,7 @@ export const WorkspaceUsers = () => {
<div className="flex flex-col space-y-4">
{canEditUsers && (
<React.Fragment>
- <WorkspaceUserInvite />
+ <WorkspaceUserInvite workspace={workspace} />
<Separator />
</React.Fragment>
)}
@@ -66,6 +69,7 @@ export const WorkspaceUsers = () => {
<p className="text-sm text-muted-foreground">{email}</p>
</div>
<WorkspaceUserRoleDropdown
+ workspace={workspace}
userId={user.id}
value={role}
canEdit={canEditUsers}
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
index 13bf28fa..6bb0c98c 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
@@ -1,8 +1,6 @@
-import React from 'react';
import { WorkspaceContext } from '@/renderer/contexts/workspace';
import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
import { useAccount } from '@/renderer/contexts/account';
-import { WorkspaceSettingsDialog } from '@/renderer/components/workspaces/workspace-settings-dialog';
import { Layout } from '@/renderer/components/layouts/layout';
export const Workspace = () => {
@@ -11,7 +9,6 @@ export const Workspace = () => {
const account = useAccount();
const navigate = useNavigate();
const [searchParams, setSearchParams] = useSearchParams();
- const [openSettings, setOpenSettings] = React.useState(false);
const workspace = account.workspaces.find((w) => w.userId === userId);
if (!workspace) {
@@ -49,9 +46,6 @@ export const Workspace = () => {
return prev;
});
},
- openSettings() {
- setOpenSettings(true);
- },
markAsSeen() {
// window.colanode.executeMutation({
// type: 'mark_node_as_seen',
@@ -63,12 +57,6 @@ export const Workspace = () => {
}}
>
<Layout nodeId={nodeId} modal={modal} />
- {openSettings && (
- <WorkspaceSettingsDialog
- open={openSettings}
- onOpenChange={setOpenSettings}
- />
- )}
</WorkspaceContext.Provider>
);
};
diff --git a/apps/desktop/src/renderer/contexts/app.ts b/apps/desktop/src/renderer/contexts/app.ts
index e11eccc5..84aeade7 100644
--- a/apps/desktop/src/renderer/contexts/app.ts
+++ b/apps/desktop/src/renderer/contexts/app.ts
@@ -11,6 +11,7 @@ interface AppContext {
setAccount: (id: string) => void;
showAccountLogout: (id: string) => void;
showAccountSettings: (id: string) => void;
+ showWorkspaceSettings: (id: string) => void;
}
export const AppContext = createContext<AppContext>({} as AppContext);
diff --git a/apps/desktop/src/renderer/contexts/workspace.ts b/apps/desktop/src/renderer/contexts/workspace.ts
index 0c1e705a..aee19c5b 100644
--- a/apps/desktop/src/renderer/contexts/workspace.ts
+++ b/apps/desktop/src/renderer/contexts/workspace.ts
@@ -6,7 +6,6 @@ interface WorkspaceContext extends Workspace {
isNodeActive: (nodeId: string) => boolean;
openModal: (nodeId: string) => void;
closeModal: () => void;
- openSettings: () => void;
markAsSeen: (nodeId: string, versionId: string) => void;
}
diff --git a/apps/desktop/src/shared/mutations/workspace-users-invite.ts b/apps/desktop/src/shared/mutations/workspace-users-invite.ts
index a335cfe9..b7116ee0 100644
--- a/apps/desktop/src/shared/mutations/workspace-users-invite.ts
+++ b/apps/desktop/src/shared/mutations/workspace-users-invite.ts
@@ -1,7 +1,10 @@
+import { WorkspaceRole } from '@colanode/core';
+
export type WorkspaceUsersInviteMutationInput = {
type: 'workspace_users_invite';
emails: string[];
userId: string;
+ role: WorkspaceRole;
};
export type WorkspaceUsersInviteMutationOutput = {
diff --git a/apps/server/src/routes/workspaces.ts b/apps/server/src/routes/workspaces.ts
index 047de6ff..a26b59b5 100644
--- a/apps/server/src/routes/workspaces.ts
+++ b/apps/server/src/routes/workspaces.ts
@@ -595,7 +595,6 @@ workspacesRouter.post(
accountId: account!.id,
parentId: workspace.id,
};
-
userDoc.updateAttributes(userAttributes);
workspaceUsersToCreate.push({