Skip to content

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

Implement collaborator field

Hakan Shehub2ee7f59bc3a
diff --git a/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx b/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx
index 9d158683..209d67de 100644
--- a/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx
@@ -4,10 +4,15 @@ import {
PopoverContent,
PopoverTrigger,
} from '@/renderer/components/ui/popover';
-import { ChatCreateCommand } from '@/renderer/components/chats/chat-create-command';
import { Plus } from 'lucide-react';
+import { useMutation } from '@/renderer/hooks/use-mutation';
+import { UserSearch } from '@/renderer/components/users/user-search';
+import { useWorkspace } from '@/renderer/contexts/workspace';
export const ChatCreatePopover = () => {
+ const workspace = useWorkspace();
+ const { mutate, isPending } = useMutation();
+
const [open, setOpen] = React.useState(false);
return (
@@ -16,7 +21,24 @@ export const ChatCreatePopover = () => {
<Plus className="mr-2 size-4 cursor-pointer" />
</PopoverTrigger>
<PopoverContent className="w-96 p-1">
- <ChatCreateCommand />
+ <UserSearch
+ onSelect={(user) => {
+ if (isPending) return;
+
+ mutate({
+ input: {
+ type: 'chat_create',
+ userId: workspace.userId,
+ otherUserId: user.id,
+ workspaceId: workspace.id,
+ },
+ onSuccess(output) {
+ workspace.openInMain(output.id);
+ setOpen(false);
+ },
+ });
+ }}
+ />
</PopoverContent>
</Popover>
);
diff --git a/apps/desktop/src/renderer/components/records/record-field-value.tsx b/apps/desktop/src/renderer/components/records/record-field-value.tsx
index 841eee70..03d841e8 100644
--- a/apps/desktop/src/renderer/components/records/record-field-value.tsx
+++ b/apps/desktop/src/renderer/components/records/record-field-value.tsx
@@ -10,6 +10,7 @@ import { RecordEmailValue } from '@/renderer/components/records/values/record-em
import { RecordUrlValue } from '@/renderer/components/records/values/record-url-value';
import { RecordMultiSelectValue } from '@/renderer/components/records/values/record-multi-select-value';
import { RecordDateValue } from '@/renderer/components/records/values/record-date-value';
+import { RecordCollaboratorValue } from '@/renderer/components/records/values/record-collaborator-value';
interface RecordFieldValueProps {
field: FieldAttributes;
@@ -23,6 +24,8 @@ export const RecordFieldValue = ({ field }: RecordFieldValueProps) => {
return <RecordCreatedAtValue field={field} />;
case 'createdBy':
return <RecordCreatedByValue field={field} />;
+ case 'collaborator':
+ return <RecordCollaboratorValue field={field} />;
case 'date':
return <RecordDateValue field={field} />;
case 'email':
diff --git a/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx b/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx
new file mode 100644
index 00000000..f43d279b
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx
@@ -0,0 +1,154 @@
+import React from 'react';
+import { CollaboratorFieldAttributes, UserNode } from '@colanode/core';
+import { useRecord } from '@/renderer/contexts/record';
+import { useQueries } from '@/renderer/hooks/use-queries';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import {
+ Popover,
+ PopoverTrigger,
+ PopoverContent,
+} from '@/renderer/components/ui/popover';
+import { UserSearch } from '@/renderer/components/users/user-search';
+import { Badge } from '@/renderer/components/ui/badge';
+import { Separator } from '@/renderer/components/ui/separator';
+import { X } from 'lucide-react';
+
+interface RecordCollaboratorValueProps {
+ field: CollaboratorFieldAttributes;
+}
+
+const CollaboratorBadge = ({ collaborator }: { collaborator: UserNode }) => {
+ return (
+ <div className="flex flex-row items-center gap-1 text-sm">
+ <Avatar
+ id={collaborator.id}
+ name={collaborator.attributes.name}
+ avatar={collaborator.attributes.avatar}
+ size="small"
+ />
+ <p>{collaborator.attributes.name}</p>
+ </div>
+ );
+};
+
+export const RecordCollaboratorValue = ({
+ field,
+}: RecordCollaboratorValueProps) => {
+ const workspace = useWorkspace();
+ const record = useRecord();
+
+ const [open, setOpen] = React.useState(false);
+
+ const collaboratorIds = record.getCollaboratorValue(field) ?? [];
+ const results = useQueries(
+ collaboratorIds.map((id) => ({
+ type: 'node_get',
+ nodeId: id,
+ userId: workspace.userId,
+ }))
+ );
+
+ const collaborators: UserNode[] = [];
+ for (const result of results) {
+ if (result.data && result.data.type === 'user') {
+ collaborators.push(result.data);
+ }
+ }
+
+ return (
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
+ <div className="flex h-full w-full cursor-pointer flex-wrap gap-1 p-1 overflow-hidden">
+ {collaborators.map((collaborator) => (
+ <CollaboratorBadge
+ key={collaborator.id}
+ collaborator={collaborator}
+ />
+ ))}
+ {collaborators.length === 0 && ' '}
+ {collaborators.length > 1 && (
+ <Badge
+ variant="outline"
+ className="ml-2 text-xs px-1 text-muted-foreground"
+ >
+ +{collaborators.length - 1}
+ </Badge>
+ )}
+ </div>
+ </PopoverTrigger>
+ <PopoverContent className="w-80 p-1">
+ <div className="flex flex-col flex-wrap gap-2 p-2">
+ {collaborators.length > 0 ? (
+ <React.Fragment>
+ {collaborators.map((collaborator) => (
+ <div
+ key={collaborator.id}
+ className="flex w-full flex-row items-center gap-2"
+ >
+ <Avatar
+ id={collaborator.id}
+ name={collaborator.attributes.name}
+ avatar={collaborator.attributes.avatar}
+ className="h-7 w-7"
+ />
+ <div className="flex flex-grow flex-col">
+ <p className="text-sm">{collaborator.attributes.name}</p>
+ <p className="text-xs text-muted-foreground">
+ {collaborator.attributes.email}
+ </p>
+ </div>
+ <X
+ className="size-4 cursor-pointer"
+ onClick={() => {
+ if (!record.canEdit) return;
+
+ const newCollaborators = collaboratorIds.filter(
+ (id) => id !== collaborator.id
+ );
+
+ if (newCollaborators.length === 0) {
+ record.removeFieldValue(field);
+ } else {
+ record.updateFieldValue(field, {
+ type: 'collaborator',
+ value: newCollaborators,
+ });
+ }
+ }}
+ />
+ </div>
+ ))}
+ <Separator className="w-full my-2" />
+ </React.Fragment>
+ ) : (
+ <p className="text-sm text-muted-foreground">No collaborators</p>
+ )}
+ </div>
+ {record.canEdit && (
+ <UserSearch
+ exclude={collaboratorIds}
+ onSelect={(user) => {
+ if (!record.canEdit) return;
+
+ const newCollaborators = collaboratorIds.includes(user.id)
+ ? collaboratorIds.filter((id) => id !== user.id)
+ : [...collaboratorIds, user.id];
+
+ if (newCollaborators.length === 0) {
+ record.removeFieldValue(field);
+ } else {
+ record.updateFieldValue(field, {
+ type: 'collaborator',
+ value: newCollaborators,
+ });
+ }
+
+ setOpen(false);
+ }}
+ />
+ )}
+ </PopoverContent>
+ </Popover>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/chats/chat-create-command.tsx b/apps/desktop/src/renderer/components/users/user-search.tsx
similarity index 75%
rename from apps/desktop/src/renderer/components/chats/chat-create-command.tsx
rename to apps/desktop/src/renderer/components/users/user-search.tsx
index 1981b1b4..5396be99 100644
--- a/apps/desktop/src/renderer/components/chats/chat-create-command.tsx
+++ b/apps/desktop/src/renderer/components/users/user-search.tsx
@@ -9,10 +9,15 @@ import {
} from '@/renderer/components/ui/command';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
-import { useMutation } from '@/renderer/hooks/use-mutation';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { UserNode } from '@colanode/core';
-export const ChatCreateCommand = () => {
+interface UserSearchProps {
+ exclude?: string[];
+ onSelect: (user: UserNode) => void;
+}
+
+export const UserSearch = ({ exclude, onSelect }: UserSearchProps) => {
const workspace = useWorkspace();
const [query, setQuery] = React.useState('');
@@ -20,10 +25,9 @@ export const ChatCreateCommand = () => {
type: 'user_search',
searchQuery: query,
userId: workspace.userId,
+ exclude,
});
- const { mutate } = useMutation();
-
return (
<Command className="min-h-min" shouldFilter={false}>
<CommandInput
@@ -39,18 +43,8 @@ export const ChatCreateCommand = () => {
<CommandItem
key={user.id}
onSelect={() => {
- mutate({
- input: {
- type: 'chat_create',
- userId: workspace.userId,
- otherUserId: user.id,
- workspaceId: workspace.id,
- },
- onSuccess(output) {
- workspace.openInMain(output.id);
- setQuery('');
- },
- });
+ onSelect(user);
+ setQuery('');
}}
>
<div className="flex w-full flex-row items-center gap-2">