Skip to content

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

Add authorization checks and refactor conversations

Hakan Shehu5a7c6a381a8a
diff --git a/apps/desktop/src/renderer/components/channels/channel-body.tsx b/apps/desktop/src/renderer/components/channels/channel-body.tsx
index 0e323dfc..a3380768 100644
--- a/apps/desktop/src/renderer/components/channels/channel-body.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-body.tsx
@@ -1,10 +1,11 @@
-import { ChannelNode } from '@colanode/core';
+import { ChannelNode, NodeRole } from '@colanode/core';
import { Conversation } from '@/renderer/components/messages/conversation';
interface ChannelBodyProps {
channel: ChannelNode;
+ role: NodeRole;
}
-export const ChannelBody = ({ channel }: ChannelBodyProps) => {
- return <Conversation conversationId={channel.id} />;
+export const ChannelBody = ({ channel, role }: ChannelBodyProps) => {
+ return <Conversation conversationId={channel.id} role={role} />;
};
diff --git a/apps/desktop/src/renderer/components/channels/channel-container.tsx b/apps/desktop/src/renderer/components/channels/channel-container.tsx
index cf4d87e3..254b6d28 100644
--- a/apps/desktop/src/renderer/components/channels/channel-container.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-container.tsx
@@ -31,7 +31,7 @@ export const ChannelContainer = ({ nodeId }: ChannelContainerProps) => {
return (
<div className="flex h-full w-full flex-col">
<ChannelHeader nodes={nodes} channel={channel} role={role} />
- <ChannelBody channel={channel} />
+ <ChannelBody channel={channel} role={role} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-body.tsx b/apps/desktop/src/renderer/components/chats/chat-body.tsx
index c85ec189..00693e41 100644
--- a/apps/desktop/src/renderer/components/chats/chat-body.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-body.tsx
@@ -1,10 +1,11 @@
-import { ChatNode } from '@colanode/core';
+import { ChatNode, NodeRole } from '@colanode/core';
import { Conversation } from '@/renderer/components/messages/conversation';
interface ChatBodyProps {
chat: ChatNode;
+ role: NodeRole;
}
-export const ChatBody = ({ chat }: ChatBodyProps) => {
- return <Conversation conversationId={chat.id} />;
+export const ChatBody = ({ chat, role }: ChatBodyProps) => {
+ return <Conversation conversationId={chat.id} role={role} />;
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-container.tsx b/apps/desktop/src/renderer/components/chats/chat-container.tsx
index e3eaee54..e02b1501 100644
--- a/apps/desktop/src/renderer/components/chats/chat-container.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-container.tsx
@@ -2,6 +2,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
import { ChatHeader } from '@/renderer/components/chats/chat-header';
import { ChatBody } from '@/renderer/components/chats/chat-body';
+import { extractNodeRole } from '@colanode/core';
interface ChatContainerProps {
nodeId: string;
@@ -25,10 +26,15 @@ export const ChatContainer = ({ nodeId }: ChatContainerProps) => {
return null;
}
+ const role = extractNodeRole([node], workspace.userId);
+ if (!role) {
+ return null;
+ }
+
return (
<div className="flex h-full w-full flex-col">
<ChatHeader chat={node} />
- <ChatBody chat={node} />
+ <ChatBody chat={node} role={role} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
index 684208f2..1b1365e8 100644
--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
@@ -31,7 +31,7 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {
const mentionsCount = 0;
return (
- <button
+ <div
key={node.id}
className={cn(
'flex w-full items-center',
@@ -60,6 +60,6 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {
{mentionsCount == 0 && isUnread && (
<span className="size-2 rounded-full bg-red-500" />
)}
- </button>
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/messages/conversation.tsx b/apps/desktop/src/renderer/components/messages/conversation.tsx
index c35f8968..37e33ac2 100644
--- a/apps/desktop/src/renderer/components/messages/conversation.tsx
+++ b/apps/desktop/src/renderer/components/messages/conversation.tsx
@@ -6,12 +6,22 @@ import {
} from '@/renderer/components/messages/message-create';
import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { InView } from 'react-intersection-observer';
+import {
+ hasAdminAccess,
+ hasCollaboratorAccess,
+ NodeRole,
+} from '@colanode/core';
+import { ConversationContext } from '@/renderer/contexts/conversation';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface ConversationProps {
conversationId: string;
+ role: NodeRole;
}
-export const Conversation = ({ conversationId }: ConversationProps) => {
+export const Conversation = ({ conversationId, role }: ConversationProps) => {
+ const workspace = useWorkspace();
+
const viewportRef = React.useRef<HTMLDivElement>(null);
const containerRef = React.useRef<HTMLDivElement>(null);
const observerRef = React.useRef<ResizeObserver | null>(null);
@@ -60,27 +70,37 @@ export const Conversation = ({ conversationId }: ConversationProps) => {
}
};
+ const isAdmin = hasAdminAccess(role);
+ const isCollaborator = hasCollaboratorAccess(role);
+
return (
- <React.Fragment>
+ <ConversationContext.Provider
+ value={{
+ id: conversationId,
+ role,
+ canCreateMessage: isCollaborator,
+ onReply: (message) => {
+ if (messageCreateRef.current) {
+ messageCreateRef.current.setReplyTo(message);
+ }
+ },
+ onLastMessageIdChange: () => {
+ if (shouldScrollToBottomRef.current && bottomRef.current) {
+ bottomRef.current.scrollIntoView();
+ }
+ },
+ canDeleteMessage: (message) => {
+ return isAdmin || message.author.id === workspace.userId;
+ },
+ }}
+ >
<ScrollArea
ref={viewportRef}
onScroll={handleScroll}
className="flex-grow overflow-y-auto px-10"
>
<div className="container" ref={containerRef}>
- <MessageList
- conversationId={conversationId}
- onLastMessageIdChange={() => {
- if (shouldScrollToBottomRef.current && bottomRef.current) {
- bottomRef.current.scrollIntoView();
- }
- }}
- onReply={(message) => {
- if (messageCreateRef.current) {
- messageCreateRef.current.setReplyTo(message);
- }
- }}
- />
+ <MessageList />
</div>
<InView
className="h-4"
@@ -92,7 +112,7 @@ export const Conversation = ({ conversationId }: ConversationProps) => {
<div ref={bottomRef} className="h-4"></div>
</InView>
</ScrollArea>
- <MessageCreate ref={messageCreateRef} conversationId={conversationId} />
- </React.Fragment>
+ <MessageCreate ref={messageCreateRef} />
+ </ConversationContext.Provider>
);
};
diff --git a/apps/desktop/src/renderer/components/messages/message-create.tsx b/apps/desktop/src/renderer/components/messages/message-create.tsx
index 8a6709b8..104a0a18 100644
--- a/apps/desktop/src/renderer/components/messages/message-create.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-create.tsx
@@ -6,103 +6,200 @@ import {
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { MessageNode } from '@/types/messages';
-import { CircleX } from 'lucide-react';
import { editorHasContent } from '@/lib/editor';
-
-interface MessageCreateProps {
- conversationId: string;
-}
+import { useConversation } from '@/renderer/contexts/conversation';
+import { MessageReplyBanner } from '@/renderer/components/messages/message-reply-banner';
+import { JSONContent } from '@tiptap/core';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { Send, Plus, Search, Upload } from 'lucide-react';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/renderer/components/ui/dropdown-menu';
+import { toast } from '@/renderer/hooks/use-toast';
export interface MessageCreateRefProps {
- setReplyTo: (replyTo: MessageNode | null) => void;
+ setReplyTo: (replyTo: MessageNode) => void;
}
-export const MessageCreate = React.forwardRef<
- MessageCreateRefProps,
- MessageCreateProps
->(({ conversationId }, ref) => {
- const workspace = useWorkspace();
- const { mutate, isPending } = useMutation();
-
- const [hasContent, setHasContent] = React.useState<boolean>(false);
- const messageEditorRef = React.useRef<MessageEditorRefProps>(null);
- const [replyTo, setReplyTo] = React.useState<MessageNode | null>(null);
-
- React.useImperativeHandle(ref, () => ({
- setReplyTo: (replyTo) => {
- setReplyTo(replyTo);
- if (messageEditorRef.current) {
- messageEditorRef.current.focus();
+export const MessageCreate = React.forwardRef<MessageCreateRefProps>(
+ (_, ref) => {
+ const workspace = useWorkspace();
+ const conversation = useConversation();
+
+ const { mutate, isPending } = useMutation();
+
+ const messageEditorRef = React.useRef<MessageEditorRefProps>(null);
+ const [content, setContent] = React.useState<JSONContent | null>(null);
+ const [replyTo, setReplyTo] = React.useState<MessageNode | null>(null);
+
+ const hasContent = content != null && editorHasContent(content);
+
+ React.useImperativeHandle(ref, () => ({
+ setReplyTo: (replyTo) => {
+ if (!conversation.canCreateMessage) {
+ return;
+ }
+
+ setReplyTo(replyTo);
+ if (messageEditorRef.current) {
+ messageEditorRef.current.focus();
+ }
+ },
+ }));
+
+ const handleSubmit = React.useCallback(() => {
+ if (!conversation.canCreateMessage) {
+ return;
+ }
+
+ if (content == null || !editorHasContent(content)) {
+ return;
}
- },
- }));
-
- return (
- <div className="container mt-1 px-10">
- <div className="flex flex-col">
- {replyTo && (
- <div className="flex flex-row items-center justify-between rounded-t-lg border-b-2 bg-gray-100 p-2 text-foreground">
- <p className="text-sm">
- Replying to{' '}
- <span className="font-semibold">{replyTo.author.name}</span>
- </p>
- <button
- className="cursor-pointer"
- onClick={() => {
- setReplyTo(null);
- }}
- >
- <CircleX className="size-4" />
- </button>
+
+ if (!content || !content.content) {
+ return;
+ }
+
+ if (replyTo) {
+ content.content.unshift({
+ type: 'messageReference',
+ attrs: {
+ id: replyTo.id,
+ name: replyTo.author.name,
+ },
+ content: replyTo.content,
+ });
+ }
+
+ mutate({
+ input: {
+ type: 'message_create',
+ conversationId: conversation.id,
+ content: content,
+ userId: workspace.userId,
+ },
+ onSuccess: () => {
+ setReplyTo(null);
+ if (messageEditorRef.current) {
+ messageEditorRef.current.clear();
+ messageEditorRef.current.focus();
+ }
+ },
+ });
+ }, [
+ conversation.id,
+ conversation.canCreateMessage,
+ content,
+ replyTo,
+ workspace.userId,
+ ]);
+
+ const handleUploadClick = React.useCallback(async () => {
+ if (messageEditorRef.current == null) {
+ return;
+ }
+
+ const result = await window.colanode.openFileDialog({
+ properties: ['openFile'],
+ buttonLabel: 'Upload',
+ title: 'Upload files to message',
+ });
+
+ if (result.canceled) {
+ return;
+ }
+
+ const filePath = result.filePaths[0];
+ const fileMetadata = await window.colanode.getFileMetadata(filePath);
+
+ if (fileMetadata === null) {
+ toast({
+ title: 'Failed to add file',
+ description:
+ 'Something went wrong adding file to the message. Please try again!',
+ variant: 'destructive',
+ });
+
+ return;
+ }
+
+ messageEditorRef.current?.addFile(fileMetadata);
+ }, [messageEditorRef]);
+
+ return (
+ <div className="container mt-1 px-10">
+ <div className="flex flex-col">
+ {conversation.canCreateMessage && replyTo && (
+ <MessageReplyBanner
+ message={replyTo}
+ onCancel={() => setReplyTo(null)}
+ />
+ )}
+ <div className="flex min-h-0 flex-row items-center rounded bg-gray-100 p-2 pl-0">
+ <div className="flex w-10 items-center justify-center">
+ <DropdownMenu>
+ <DropdownMenuTrigger
+ disabled={isPending || !conversation.canCreateMessage}
+ >
+ <span>
+ <Plus size={20} />
+ </span>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent>
+ <DropdownMenuItem disabled={true}>
+ <div className="flex flex-row items-center gap-2 text-sm">
+ <Search className="size-4" />
+ <span>Browse</span>
+ </div>
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={handleUploadClick}>
+ <div className="flex cursor-pointer flex-row items-center gap-2 text-sm">
+ <Upload className="size-4" />
+ <span>Upload</span>
+ </div>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ <div className="max-h-72 flex-grow overflow-y-auto">
+ {conversation.canCreateMessage ? (
+ <MessageEditor
+ ref={messageEditorRef}
+ conversationId={conversation.id}
+ onChange={setContent}
+ onSubmit={handleSubmit}
+ />
+ ) : (
+ <p className="m-0 px-0 py-1 text-muted-foreground">
+ You don't have permission to create messages in this
+ conversation
+ </p>
+ )}
+ </div>
+ <div className="flex flex-row gap-2">
+ {isPending ? (
+ <Spinner size={20} />
+ ) : (
+ <button
+ type="submit"
+ className={`${
+ conversation.canCreateMessage && hasContent
+ ? 'cursor-pointer text-blue-600'
+ : 'cursor-default text-muted-foreground'
+ }`}
+ onClick={handleSubmit}
+ >
+ <Send size={20} />
+ </button>
+ )}
+ </div>
</div>
- )}
- <MessageEditor
- ref={messageEditorRef}
- conversationId={conversationId}
- onChange={(content) => {
- setHasContent(editorHasContent(content));
- }}
- onSubmit={(content) => {
- if (!editorHasContent(content)) {
- return;
- }
-
- const messageContent = content;
- if (!messageContent) {
- return;
- }
-
- if (replyTo) {
- messageContent.unshift({
- type: 'messageReference',
- attrs: {
- id: replyTo.id,
- name: replyTo.author.name,
- },
- content: replyTo.content,
- });
- }
- mutate({
- input: {
- type: 'message_create',
- conversationId: conversationId,
- content: messageContent,
- userId: workspace.userId,
- },
- onSuccess: () => {
- setReplyTo(null);
- if (messageEditorRef.current) {
- messageEditorRef.current.focus();
- }
- },
- });
- }}
- loading={isPending}
- canEdit={true}
- canSubmit={hasContent}
- />
+ </div>
+ <div className="flex h-8 min-h-8 items-center text-xs text-muted-foreground"></div>
</div>
- <div className="flex h-8 min-h-8 items-center text-xs text-muted-foreground"></div>
- </div>
- );
-});
+ );
+ }
+);
diff --git a/apps/desktop/src/renderer/components/messages/message-editor.tsx b/apps/desktop/src/renderer/components/messages/message-editor.tsx
index 72d211d9..b9514377 100644
--- a/apps/desktop/src/renderer/components/messages/message-editor.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-editor.tsx
@@ -2,13 +2,6 @@ import React from 'react';
import type { JSONContent } from '@tiptap/core';
import { EditorContent, useEditor } from '@tiptap/react';
import isHotkey from 'is-hotkey';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@/renderer/components/ui/dropdown-menu';
-import { Spinner } from '@/renderer/components/ui/spinner';
import {
MessageNode,
TextNode,
@@ -32,21 +25,18 @@ import {
FileNode,
} from '@/renderer/editor/extensions';
import { EditorBubbleMenu } from '@/renderer/editor/menu/bubble-menu';
-import { Plus, Search, Send, Upload } from 'lucide-react';
-import { toast } from '@/renderer/hooks/use-toast';
+import { FileMetadata } from '@/types/files';
interface MessageEditorProps {
conversationId: string;
- canSubmit?: boolean;
- canEdit?: boolean;
- loading?: boolean;
onChange?: (content: JSONContent) => void;
- onSubmit: (content: JSONContent) => void;
+ onSubmit: () => void;
}
export interface MessageEditorRefProps {
focus: () => void;
clear: () => void;
+ addFile: (file: FileMetadata) => void;
}
export const MessageEditor = React.forwardRef<
@@ -92,20 +82,10 @@ export const MessageEditor = React.forwardRef<
props.onChange?.(e.editor.getJSON());
},
autofocus: 'end',
- editable: props.canEdit,
},
[props.conversationId]
);
- const handleSubmit = React.useCallback(() => {
- if (editor == null) {
- return;
- }
-
- props.onSubmit(editor.getJSON());
- editor.chain().clearContent(true).focus().run();
- }, [editor, props]);
-
React.useImperativeHandle(ref, () => ({
focus: () => {
if (editor == null) {
@@ -116,114 +96,49 @@ export const MessageEditor = React.forwardRef<
editor?.view?.focus();
},
clear: () => {
- editor?.chain().clearContent(true).focus().run();
- },
- }));
-
- const handleUploadClick = React.useCallback(async () => {
- if (editor == null) {
- return;
- }
-
- const result = await window.colanode.openFileDialog({
- properties: ['openFile'],
- buttonLabel: 'Upload',
- title: 'Upload files to message',
- });
-
- if (result.canceled) {
- return;
- }
-
- const filePath = result.filePaths[0];
- const fileMetadata = await window.colanode.getFileMetadata(filePath);
+ if (editor == null) {
+ return;
+ }
- if (fileMetadata === null) {
- toast({
- title: 'Failed to add file',
- description:
- 'Something went wrong adding file to the message. Please try again!',
- variant: 'destructive',
- });
+ editor.chain().clearContent(true).focus().run();
+ },
+ addFile: (file: FileMetadata) => {
+ if (editor == null) {
+ return;
+ }
- return;
- }
+ editor.chain().focus().addFilePlaceholder(file).run();
+ },
+ }));
- editor.chain().focus().addFilePlaceholder(fileMetadata).run();
- }, [editor]);
+ if (editor == null) {
+ return null;
+ }
return (
- <div className="flex min-h-0 flex-row items-center rounded bg-gray-100 p-2 pl-0">
- <div className="flex w-10 items-center justify-center">
- <DropdownMenu>
- <DropdownMenuTrigger disabled={!props.canEdit}>
- <span>
- <Plus size={20} />
- </span>
- </DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem disabled={true}>
- <div className="flex flex-row items-center gap-2 text-sm">
- <Search className="size-4" />
- <span>Browse</span>
- </div>
- </DropdownMenuItem>
- <DropdownMenuItem onClick={handleUploadClick}>
- <div className="flex cursor-pointer flex-row items-center gap-2 text-sm">
- <Upload className="size-4" />
- <span>Upload</span>
- </div>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- <div className="max-h-72 flex-grow overflow-y-auto">
- {editor && <EditorBubbleMenu editor={editor} />}
- <EditorContent
- editor={editor}
- onKeyDown={(event) => {
- if (editor == null) {
- return false;
- }
-
- if (isHotkey('enter', event)) {
- if (editor.storage?.mention?.isOpen) {
- return false;
- }
+ <React.Fragment>
+ <EditorBubbleMenu editor={editor} />
+ <EditorContent
+ editor={editor}
+ onKeyDown={(event) => {
+ if (editor == null) {
+ return false;
+ }
- event.preventDefault();
- event.stopPropagation();
- handleSubmit();
- return true;
+ if (isHotkey('enter', event)) {
+ if (editor.storage?.mention?.isOpen) {
+ return false;
}
- return false;
- }}
- />
- </div>
- <div className="flex flex-row gap-2">
- {props.loading ? (
- <Spinner size={20} />
- ) : (
- <button
- type="submit"
- className={`${
- props.canSubmit
- ? 'cursor-pointer text-blue-600'
- : 'cursor-default text-muted-foreground'
- }`}
- onClick={() => {
- if (editor == null) {
- return;
- }
+ event.preventDefault();
+ event.stopPropagation();
+ props.onSubmit();
+ return true;
+ }
- handleSubmit();
- }}
- >
- <Send size={20} />
- </button>
- )}
- </div>
- </div>
+ return false;
+ }}
+ />
+ </React.Fragment>
);
});
diff --git a/apps/desktop/src/renderer/components/messages/message-list.tsx b/apps/desktop/src/renderer/components/messages/message-list.tsx
index 6b2482ce..7ca99032 100644
--- a/apps/desktop/src/renderer/components/messages/message-list.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-list.tsx
@@ -3,24 +3,16 @@ import { InView } from 'react-intersection-observer';
import { Message } from '@/renderer/components/messages/message';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { compareString } from '@/lib/utils';
-import { MessageNode } from '@/types/messages';
import { useQueries } from '@/renderer/hooks/use-queries';
import { MessageListQueryInput } from '@/operations/queries/message-list';
-
-interface MessageListProps {
- conversationId: string;
- onLastMessageIdChange: (id: string) => void;
- onReply: (replyTo: MessageNode | null) => void;
-}
+import { useConversation } from '@/renderer/contexts/conversation';
const MESSAGES_PER_PAGE = 50;
-export const MessageList = ({
- conversationId,
- onLastMessageIdChange,
- onReply,
-}: MessageListProps) => {
+export const MessageList = () => {
const workspace = useWorkspace();
+ const conversation = useConversation();
+
const lastMessageId = React.useRef<string | null>(null);
const [lastPage, setLastPage] = React.useState<number>(1);
@@ -28,7 +20,7 @@ export const MessageList = ({
length: lastPage,
}).map((_, i) => ({
type: 'message_list',
- conversationId: conversationId,
+ conversationId: conversation.id,
userId: workspace.userId,
page: i + 1,
count: MESSAGES_PER_PAGE,
@@ -49,7 +41,7 @@ export const MessageList = ({
const lastMessage = messages[messages.length - 1];
if (lastMessage.id !== lastMessageId.current) {
lastMessageId.current = lastMessage.id;
- onLastMessageIdChange(lastMessageId.current);
+ conversation.onLastMessageIdChange(lastMessageId.current);
}
}
}, [messages]);
@@ -86,11 +78,7 @@ export const MessageList = ({
<div className="flex-grow border-t border-gray-100" />
</div>
)}
- <Message
- message={message}
- previousMessage={previousMessage}
- onReply={onReply}
- />
+ <Message message={message} previousMessage={previousMessage} />
</React.Fragment>
);
})}
diff --git a/apps/desktop/src/renderer/components/messages/message-reply-banner.tsx b/apps/desktop/src/renderer/components/messages/message-reply-banner.tsx
new file mode 100644
index 00000000..06a1d607
--- /dev/null
+++ b/apps/desktop/src/renderer/components/messages/message-reply-banner.tsx
@@ -0,0 +1,23 @@
+import { MessageNode } from '@/types/messages';
+import { CircleX } from 'lucide-react';
+
+interface MessageReplyBannerProps {
+ message: MessageNode;
+ onCancel: () => void;
+}
+
+export const MessageReplyBanner = ({
+ message,
+ onCancel,
+}: MessageReplyBannerProps) => {
+ return (
+ <div className="flex flex-row items-center justify-between rounded-t-lg border-b-2 bg-gray-100 p-2 text-foreground">
+ <p className="text-sm">
+ Replying to <span className="font-semibold">{message.author.name}</span>
+ </p>
+ <button className="cursor-pointer" onClick={onCancel}>
+ <CircleX className="size-4" />
+ </button>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/messages/message.tsx b/apps/desktop/src/renderer/components/messages/message.tsx
index d00e5876..1bc05207 100644
--- a/apps/desktop/src/renderer/components/messages/message.tsx
+++ b/apps/desktop/src/renderer/components/messages/message.tsx
@@ -14,11 +14,11 @@ import { MessageReactions } from '@/renderer/components/messages/message-reactio
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { MessagesSquare, Reply } from 'lucide-react';
+import { useConversation } from '@/renderer/contexts/conversation';
interface MessageProps {
message: MessageNode;
previousMessage?: MessageNode | null;
- onReply: (replyTo: MessageNode | null) => void;
}
const shouldDisplayUserInfo = (
@@ -39,16 +39,14 @@ const shouldDisplayUserInfo = (
return previousMessage.author.id !== message.author.id;
};
-export const Message = ({
- message,
- previousMessage,
- onReply,
-}: MessageProps) => {
+export const Message = ({ message, previousMessage }: MessageProps) => {
const workspace = useWorkspace();
+ const conversation = useConversation();
+
const { mutate, isPending } = useMutation();
- const canDelete = true;
- const canReplyInThread = false;
+ const canDelete = conversation.canDeleteMessage(message);
+ const canReplyInThread = conversation.canCreateMessage;
const displayUserInfo = shouldDisplayUserInfo(message, previousMessage);
return (
@@ -72,8 +70,8 @@ export const Message = ({
<div className="relative w-full">
{displayUserInfo && (
- <p className="font-medium">
- {message.author.name}
+ <div className="font-medium">
+ <span>{message.author.name}</span>
<Tooltip>
<TooltipTrigger asChild>
<span className="ml-2 text-xs text-muted-foreground">
@@ -81,12 +79,12 @@ export const Message = ({
</span>
</TooltipTrigger>
<TooltipContent>
- <span className="border border-gray-100 bg-white p-2 text-sm text-muted-foreground shadow-md">
+ <span className="text-sm shadow-md">
{formatDate(message.createdAt)}
</span>
</TooltipContent>
</Tooltip>
- </p>
+ </div>
)}
<InView
@@ -125,7 +123,7 @@ export const Message = ({
<Reply
className="size-4 cursor-pointer"
onClick={() => {
- onReply(message);
+ conversation.onReply(message);
}}
/>
</li>
diff --git a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
index e24ff357..74907821 100644
--- a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
@@ -16,20 +16,17 @@ import { SpaceDeleteForm } from '@/renderer/components/spaces/space-delete-form'
import { Info, Trash2, Users } from 'lucide-react';
import { VisuallyHidden } from '@radix-ui/react-visually-hidden';
import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';
+import { SpaceNode } from '@colanode/core';
interface SpaceSettingsDialogProps {
- id: string;
- name: string;
- avatar?: string | null;
+ space: SpaceNode;
open: boolean;
onOpenChange: (open: boolean) => void;
defaultTab?: string;
}
export const SpaceSettingsDialog = ({
- id,
- name,
- avatar,
+ space,
open,
onOpenChange,
defaultTab,
@@ -47,8 +44,13 @@ export const SpaceSettingsDialog = ({
<TabsList className="flex h-full max-h-full flex-col items-start justify-start gap-1 rounded-none border-r border-r-gray-100 bg-white pr-3">
<div className="mb-1 flex h-10 w-full items-center justify-between bg-gray-50 p-1 text-foreground/80">
<div className="flex items-center gap-2">
- <Avatar id={id} avatar={avatar} size="small" name={name} />
- <span>{name ?? 'Error'}</span>
+ <Avatar
+ id={space.id}
+ avatar={space.attributes.avatar}
+ name={space.attributes.name}
+ size="small"
+ />
+ <span>{space.attributes.name ?? 'Error'}</span>
</div>
</div>
<TabsTrigger
@@ -82,14 +84,14 @@ export const SpaceSettingsDialog = ({
className="focus-visible:ring-0 focus-visible:ring-offset-0"
value="info"
>
- <SpaceUpdateForm id={id} />
+ <SpaceUpdateForm space={space} />
</TabsContent>
<TabsContent
key="tab-content-collaborators"
className="focus-visible:ring-0 focus-visible:ring-offset-0"
value="collaborators"
>
- <NodeCollaborators nodeId={id} nodes={[]} />
+ <NodeCollaborators nodeId={space.id} nodes={[space]} />
</TabsContent>
<TabsContent
key="tab-content-delete"
@@ -97,7 +99,7 @@ export const SpaceSettingsDialog = ({
value="delete"
>
<SpaceDeleteForm
- id={id}
+ id={space.id}
onDeleted={() => {
onOpenChange(false);
}}
diff --git a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
index fb844d30..6edc846f 100644
--- a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
@@ -208,9 +208,7 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {
)}
{settingsState.open && (
<SpaceSettingsDialog
- id={node.id}
- name={node.attributes.name}
- avatar={node.attributes.avatar}
+ space={node}
open={settingsState.open}
onOpenChange={(open) =>
setSettingsState({ open, tab: settingsState.tab })
diff --git a/apps/desktop/src/renderer/components/spaces/space-update-form.tsx b/apps/desktop/src/renderer/components/spaces/space-update-form.tsx
index 1a224047..e958c7ed 100644
--- a/apps/desktop/src/renderer/components/spaces/space-update-form.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-update-form.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import * as z from 'zod';
import {
Form,
@@ -12,7 +11,6 @@ import { Input } from '@/renderer/components/ui/input';
import { Spinner } from '@/renderer/components/ui/spinner';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
@@ -20,9 +18,10 @@ import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';
import { Avatar } from '@/renderer/components/avatars/avatar';
import { Textarea } from '@/renderer/components/ui/textarea';
import { Button } from '@/renderer/components/ui/button';
+import { SpaceNode } from '@colanode/core';
interface SpaceUpdateFormProps {
- id: string;
+ space: SpaceNode;
}
const formSchema = z.object({
@@ -31,44 +30,27 @@ const formSchema = z.object({
avatar: z.string().nullable().optional(),
});
-export const SpaceUpdateForm = ({ id }: SpaceUpdateFormProps) => {
+export const SpaceUpdateForm = ({ space }: SpaceUpdateFormProps) => {
const workspace = useWorkspace();
const canEdit = true;
- const { data, isPending: isLoadingSpace } = useQuery({
- type: 'node_get',
- nodeId: id,
- userId: workspace.userId,
- });
const { mutate: updateSpace, isPending: isUpdatingSpace } = useMutation();
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
- name: '',
- description: '',
- avatar: null,
+ name: space.attributes.name,
+ description: space.attributes.description ?? '',
+ avatar: space.attributes.avatar ?? null,
},
});
- React.useEffect(() => {
- if (data && data.attributes.type === 'space') {
- form.reset({
- name: data.attributes.name,
- description: data.attributes.description ?? '',
- avatar: data.attributes.avatar ?? null,
- });
- }
- }, [isLoadingSpace, data]);
-
const handleSubmit = (values: z.infer<typeof formSchema>) => {
- if (!data?.id) return;
-
updateSpace({
input: {
type: 'space_update',
userId: workspace.userId,
- id: data.id,
+ id: space.id,
name: values.name,
description: values.description,
avatar: values.avatar,
@@ -90,10 +72,6 @@ export const SpaceUpdateForm = ({ id }: SpaceUpdateFormProps) => {
});
};
- if (isLoadingSpace) {
- return <Spinner />;
- }
-
const name = form.watch('name');
const avatar = form.watch('avatar');
@@ -108,7 +86,7 @@ export const SpaceUpdateForm = ({ id }: SpaceUpdateFormProps) => {
<AvatarPopover onPick={(avatar) => form.setValue('avatar', avatar)}>
<Button type="button" variant="outline" size="icon">
<Avatar
- id={id}
+ id={space.id}
name={name}
avatar={avatar}
className="h-6 w-6"
diff --git a/apps/desktop/src/renderer/contexts/conversation.ts b/apps/desktop/src/renderer/contexts/conversation.ts
new file mode 100644
index 00000000..1a930087
--- /dev/null
+++ b/apps/desktop/src/renderer/contexts/conversation.ts
@@ -0,0 +1,18 @@
+import { NodeRole } from '@colanode/core';
+import { createContext, useContext } from 'react';
+import { MessageNode } from '@/types/messages';
+
+interface ConversationContext {
+ id: string;
+ role: NodeRole;
+ canCreateMessage: boolean;
+ onReply: (message: MessageNode) => void;
+ onLastMessageIdChange: (id: string) => void;
+ canDeleteMessage: (message: MessageNode) => boolean;
+}
+
+export const ConversationContext = createContext<ConversationContext>(
+ {} as ConversationContext
+);
+
+export const useConversation = () => useContext(ConversationContext);
diff --git a/packages/core/src/lib/nodes.ts b/packages/core/src/lib/nodes.ts
index 318c4595..75b369a5 100644
--- a/packages/core/src/lib/nodes.ts
+++ b/packages/core/src/lib/nodes.ts
@@ -33,3 +33,24 @@ export const extractNodeRole = (
return role;
};
+
+export const hasAdminAccess = (role: NodeRole | null): boolean => {
+ return role === 'admin';
+};
+
+export const hasEditorAccess = (role: NodeRole | null): boolean => {
+ return role === 'admin' || role === 'editor';
+};
+
+export const hasCollaboratorAccess = (role: NodeRole | null): boolean => {
+ return role === 'admin' || role === 'editor' || role === 'collaborator';
+};
+
+export const hasViewerAccess = (role: NodeRole | null): boolean => {
+ return (
+ role === 'admin' ||
+ role === 'editor' ||
+ role === 'collaborator' ||
+ role === 'viewer'
+ );
+};
diff --git a/packages/core/src/registry/core.ts b/packages/core/src/registry/core.ts
index 59238ab0..9d94a44a 100644
--- a/packages/core/src/registry/core.ts
+++ b/packages/core/src/registry/core.ts
@@ -1,6 +1,12 @@
import { ZodSchema } from 'zod';
import { Node, NodeAttributes } from './';
-import { extractNodeRole } from '../lib/nodes';
+import {
+ extractNodeRole,
+ hasAdminAccess,
+ hasCollaboratorAccess,
+ hasEditorAccess,
+ hasViewerAccess,
+} from '../lib/nodes';
import { WorkspaceRole } from '../types/workspaces';
export type NodeRole = 'admin' | 'editor' | 'collaborator' | 'viewer';
@@ -29,28 +35,19 @@ export class NodeMutationContext {
}
public hasAdminAccess = () => {
- return this.nodeRole === 'admin';
+ return hasAdminAccess(this.nodeRole);
};
public hasEditorAccess = () => {
- return this.nodeRole === 'admin' || this.nodeRole === 'editor';
+ return hasEditorAccess(this.nodeRole);
};
public hasCollaboratorAccess = () => {
- return (
- this.nodeRole === 'admin' ||
- this.nodeRole === 'editor' ||
- this.nodeRole === 'collaborator'
- );
+ return hasCollaboratorAccess(this.nodeRole);
};
public hasViewerAccess = () => {
- return (
- this.nodeRole === 'admin' ||
- this.nodeRole === 'editor' ||
- this.nodeRole === 'collaborator' ||
- this.nodeRole === 'viewer'
- );
+ return hasViewerAccess(this.nodeRole);
};
}