Skip to content

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

Implement channel update

Hakan Shehu93f0bd2f0f11
diff --git a/apps/desktop/src/main/mutations/channel-create.ts b/apps/desktop/src/main/mutations/channel-create.ts
index cdc1d07f..f98be0b8 100644
--- a/apps/desktop/src/main/mutations/channel-create.ts
+++ b/apps/desktop/src/main/mutations/channel-create.ts
@@ -43,6 +43,7 @@ export class ChannelCreateMutationHandler
const attributes: ChannelAttributes = {
type: 'channel',
name: input.name,
+ avatar: input.avatar,
parentId: input.spaceId,
index: generateNodeIndex(maxIndex, null),
collaborators: null,
diff --git a/apps/desktop/src/main/mutations/channel-update.ts b/apps/desktop/src/main/mutations/channel-update.ts
new file mode 100644
index 00000000..df5865be
--- /dev/null
+++ b/apps/desktop/src/main/mutations/channel-update.ts
@@ -0,0 +1,33 @@
+import { MutationHandler } from '@/main/types';
+import {
+ ChannelUpdateMutationInput,
+ ChannelUpdateMutationOutput,
+} from '@/shared/mutations/channel-update';
+import { nodeService } from '@/main/services/node-service';
+
+export class ChannelUpdateMutationHandler
+ implements MutationHandler<ChannelUpdateMutationInput>
+{
+ async handleMutation(
+ input: ChannelUpdateMutationInput
+ ): Promise<ChannelUpdateMutationOutput> {
+ await nodeService.updateNode(
+ input.channelId,
+ input.userId,
+ (attributes) => {
+ if (attributes.type !== 'channel') {
+ throw new Error('Node is not a channel');
+ }
+
+ attributes.name = input.name;
+ attributes.avatar = input.avatar;
+
+ return attributes;
+ }
+ );
+
+ return {
+ success: true,
+ };
+ }
+}
diff --git a/apps/desktop/src/main/mutations/index.ts b/apps/desktop/src/main/mutations/index.ts
index a1592748..578652a9 100644
--- a/apps/desktop/src/main/mutations/index.ts
+++ b/apps/desktop/src/main/mutations/index.ts
@@ -39,6 +39,7 @@ import { ServerUserNodeSyncMutationHandler } from '@/main/mutations/server-user-
import { MarkNodeAsSeenMutationHandler } from '@/main/mutations/mark-node-as-seen';
import { ViewUpdateMutationHandler } from '@/main/mutations/view-update';
import { ViewDeleteMutationHandler } from '@/main/mutations/view-delete';
+import { ChannelUpdateMutationHandler } from '@/main/mutations/channel-update';
type MutationHandlerMap = {
[K in keyof MutationMap]: MutationHandler<MutationMap[K]['input']>;
@@ -84,4 +85,5 @@ export const mutationHandlerMap: MutationHandlerMap = {
mark_node_as_seen: new MarkNodeAsSeenMutationHandler(),
view_update: new ViewUpdateMutationHandler(),
view_delete: new ViewDeleteMutationHandler(),
+ channel_update: new ChannelUpdateMutationHandler(),
};
diff --git a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
index 8b93d8ee..f09d8aff 100644
--- a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
@@ -3,29 +3,13 @@ import {
Dialog,
DialogContent,
DialogDescription,
- DialogFooter,
DialogHeader,
DialogTitle,
} from '@/renderer/components/ui/dialog';
-import { z } from 'zod';
-import {
- Form,
- FormControl,
- FormField,
- FormItem,
- FormLabel,
- FormMessage,
-} from '@/renderer/components/ui/form';
-import { Input } from '@/renderer/components/ui/input';
-import { Button } from '@/renderer/components/ui/button';
-import { Spinner } from '@/renderer/components/ui/spinner';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
import { useMutation } from '@/renderer/hooks/use-mutation';
-
-const formSchema = z.object({
- name: z.string().min(3, 'Name must be at least 3 characters long.'),
-});
+import { IdType } from '@colanode/core';
+import { ChannelForm } from './channel-form';
+import { generateId } from '@colanode/core';
interface ChannelCreateDialogProps {
spaceId: string;
@@ -41,38 +25,6 @@ export const ChannelCreateDialog = ({
const workspace = useWorkspace();
const { mutate, isPending } = useMutation();
- const form = useForm<z.infer<typeof formSchema>>({
- resolver: zodResolver(formSchema),
- defaultValues: {
- name: '',
- },
- });
-
- const handleCancel = () => {
- form.reset();
- onOpenChange(false);
- };
-
- const handleSubmit = async (values: z.infer<typeof formSchema>) => {
- if (isPending) {
- return;
- }
-
- mutate({
- input: {
- type: 'channel_create',
- spaceId: spaceId,
- name: values.name,
- userId: workspace.userId,
- },
- onSuccess(output) {
- onOpenChange(false);
- form.reset();
- workspace.openInMain(output.id);
- },
- });
- };
-
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent>
@@ -82,42 +34,37 @@ export const ChannelCreateDialog = ({
Create a new channel to collaborate with your peers
</DialogDescription>
</DialogHeader>
- <Form {...form}>
- <form
- className="flex flex-col"
- onSubmit={form.handleSubmit(handleSubmit)}
- >
- <div className="flex-grow space-y-4 py-2 pb-4">
- <FormField
- control={form.control}
- name="name"
- render={({ field }) => (
- <FormItem className="flex-1">
- <FormLabel>Name *</FormLabel>
- <FormControl>
- <Input placeholder="Name" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </div>
- <DialogFooter>
- <Button
- type="button"
- variant="outline"
- disabled={isPending}
- onClick={handleCancel}
- >
- Cancel
- </Button>
- <Button type="submit" disabled={isPending}>
- {isPending && <Spinner className="mr-1" />}
- Create
- </Button>
- </DialogFooter>
- </form>
- </Form>
+ <ChannelForm
+ id={generateId(IdType.Channel)}
+ values={{
+ name: '',
+ avatar: null,
+ }}
+ isPending={isPending}
+ submitText="Create"
+ handleCancel={() => {
+ onOpenChange(false);
+ }}
+ handleSubmit={(values) => {
+ console.log('submit', values);
+ if (isPending) {
+ return;
+ }
+
+ mutate({
+ input: {
+ type: 'channel_create',
+ spaceId: spaceId,
+ name: values.name,
+ userId: workspace.userId,
+ },
+ onSuccess(output) {
+ onOpenChange(false);
+ workspace.openInMain(output.id);
+ },
+ });
+ }}
+ />
</DialogContent>
</Dialog>
);
diff --git a/apps/desktop/src/renderer/components/channels/channel-form.tsx b/apps/desktop/src/renderer/components/channels/channel-form.tsx
new file mode 100644
index 00000000..0fbafdd4
--- /dev/null
+++ b/apps/desktop/src/renderer/components/channels/channel-form.tsx
@@ -0,0 +1,110 @@
+import { z } from 'zod';
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from '@/renderer/components/ui/form';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Input } from '@/renderer/components/ui/input';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';
+
+const formSchema = z.object({
+ name: z.string().min(3, 'Name must be at least 3 characters long.'),
+ avatar: z.string().optional().nullable(),
+});
+
+interface ChannelFormProps {
+ id: string;
+ values: z.infer<typeof formSchema>;
+ isPending: boolean;
+ submitText: string;
+ handleCancel: () => void;
+ handleSubmit: (values: z.infer<typeof formSchema>) => void;
+ readOnly?: boolean;
+}
+
+export const ChannelForm = ({
+ id,
+ values,
+ isPending,
+ submitText,
+ handleCancel,
+ handleSubmit,
+ readOnly = false,
+}: ChannelFormProps) => {
+ const form = useForm<z.infer<typeof formSchema>>({
+ resolver: zodResolver(formSchema),
+ defaultValues: values,
+ });
+
+ const name = form.watch('name');
+ const avatar = form.watch('avatar');
+
+ return (
+ <Form {...form}>
+ <form
+ className="flex flex-col"
+ onSubmit={form.handleSubmit(handleSubmit)}
+ >
+ <div className="flex-grow flex flex-row items-end gap-2 py-2 pb-4">
+ {readOnly ? (
+ <Button type="button" variant="outline" size="icon">
+ <Avatar id={id} name={name} avatar={avatar} className="h-6 w-6" />
+ </Button>
+ ) : (
+ <AvatarPopover
+ onPick={(avatar) => {
+ if (isPending) return;
+ if (avatar === values.avatar) return;
+
+ form.setValue('avatar', avatar);
+ }}
+ >
+ <Button type="button" variant="outline" size="icon">
+ <Avatar
+ id={id}
+ name={name}
+ avatar={avatar}
+ className="h-6 w-6"
+ />
+ </Button>
+ </AvatarPopover>
+ )}
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem className="flex-1">
+ <FormControl>
+ <Input readOnly={readOnly} placeholder="Name" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </div>
+ <div className="flex justify-end gap-2">
+ <Button
+ type="button"
+ variant="outline"
+ disabled={isPending}
+ onClick={handleCancel}
+ >
+ Cancel
+ </Button>
+ <Button type="submit" disabled={isPending || readOnly}>
+ {isPending && <Spinner className="mr-1" />}
+ {submitText}
+ </Button>
+ </div>
+ </form>
+ </Form>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/channels/channel-header.tsx b/apps/desktop/src/renderer/components/channels/channel-header.tsx
index 1636d730..671b68e4 100644
--- a/apps/desktop/src/renderer/components/channels/channel-header.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-header.tsx
@@ -30,7 +30,7 @@ export const ChannelHeader = ({ nodes, channel, role }: ChannelHeaderProps) => {
nodes={nodes}
role={role}
/>
- <ChannelSettings nodeId={channel.id} />
+ <ChannelSettings channel={channel} role={role} />
</div>
</div>
</Header>
diff --git a/apps/desktop/src/renderer/components/channels/channel-settings.tsx b/apps/desktop/src/renderer/components/channels/channel-settings.tsx
index 6907f9d5..5bc01b13 100644
--- a/apps/desktop/src/renderer/components/channels/channel-settings.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-settings.tsx
@@ -3,24 +3,65 @@ import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/renderer/components/ui/dropdown-menu';
-import { Copy, Settings, Trash2 } from 'lucide-react';
+import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';
import { ChannelDeleteDialog } from '@/renderer/components/channels/channel-delete-dialog';
+import { ChannelNode, hasEditorAccess, NodeRole } from '@colanode/core';
+import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';
+import { ChannelUpdateDialog } from '@/renderer/components/channels/channel-update-dialog';
interface ChannelSettingsProps {
- nodeId: string;
+ channel: ChannelNode;
+ role: NodeRole;
}
-export const ChannelSettings = ({ nodeId }: ChannelSettingsProps) => {
- const [showDeleteModal, setShowDeleteModal] = React.useState(false);
+export const ChannelSettings = ({ channel, role }: ChannelSettingsProps) => {
+ const [showUpdateDialog, setShowUpdateDialog] = React.useState(false);
+ const [showDeleteDialog, setShowDeleteModal] = React.useState(false);
+
+ const canEdit = hasEditorAccess(role);
+ const canDelete = hasEditorAccess(role);
+
return (
<React.Fragment>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Settings className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
</DropdownMenuTrigger>
- <DropdownMenuContent side="bottom" className="mr-2 w-56">
+ <DropdownMenuContent side="bottom" className="mr-2 w-80">
+ <DropdownMenuLabel>{channel.attributes.name}</DropdownMenuLabel>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ className="flex items-center gap-2"
+ onClick={() => {
+ if (!canEdit) {
+ return;
+ }
+
+ setShowUpdateDialog(true);
+ }}
+ disabled={!canEdit}
+ >
+ <LetterText className="size-4" />
+ Rename
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="flex items-center gap-2"
+ disabled={!canEdit}
+ onClick={() => {
+ if (!canEdit) {
+ return;
+ }
+
+ setShowUpdateDialog(true);
+ }}
+ >
+ <Image className="size-4" />
+ Update icon
+ </DropdownMenuItem>
<DropdownMenuItem className="flex items-center gap-2" disabled>
<Copy className="size-4" />
Duplicate
@@ -28,19 +69,50 @@ export const ChannelSettings = ({ nodeId }: ChannelSettingsProps) => {
<DropdownMenuItem
className="flex items-center gap-2"
onClick={() => {
+ if (!canDelete) {
+ return;
+ }
+
setShowDeleteModal(true);
}}
+ disabled={!canDelete}
>
<Trash2 className="size-4" />
Delete
</DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuLabel>Created by</DropdownMenuLabel>
+ <DropdownMenuItem>
+ <NodeCollaboratorAudit
+ collaboratorId={channel.createdBy}
+ date={channel.createdAt}
+ />
+ </DropdownMenuItem>
+ {channel.updatedBy && (
+ <React.Fragment>
+ <DropdownMenuSeparator />
+ <DropdownMenuLabel>Last updated by</DropdownMenuLabel>
+ <DropdownMenuItem>
+ <NodeCollaboratorAudit
+ collaboratorId={channel.updatedBy}
+ date={channel.updatedAt}
+ />
+ </DropdownMenuItem>
+ </React.Fragment>
+ )}
</DropdownMenuContent>
</DropdownMenu>
<ChannelDeleteDialog
- nodeId={nodeId}
- open={showDeleteModal}
+ nodeId={channel.id}
+ open={showDeleteDialog}
onOpenChange={setShowDeleteModal}
/>
+ <ChannelUpdateDialog
+ channel={channel}
+ role={role}
+ open={showUpdateDialog}
+ onOpenChange={setShowUpdateDialog}
+ />
</React.Fragment>
);
};
diff --git a/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx
new file mode 100644
index 00000000..a92db5ff
--- /dev/null
+++ b/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx
@@ -0,0 +1,79 @@
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+} from '@/renderer/components/ui/dialog';
+import { useMutation } from '@/renderer/hooks/use-mutation';
+import { ChannelNode, hasEditorAccess, NodeRole } from '@colanode/core';
+import { ChannelForm } from '@/renderer/components/channels/channel-form';
+import { toast } from '@/renderer/hooks/use-toast';
+
+interface ChannelUpdateDialogProps {
+ channel: ChannelNode;
+ role: NodeRole;
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+}
+
+export const ChannelUpdateDialog = ({
+ channel,
+ role,
+ open,
+ onOpenChange,
+}: ChannelUpdateDialogProps) => {
+ const workspace = useWorkspace();
+ const { mutate, isPending } = useMutation();
+ const canEdit = hasEditorAccess(role);
+
+ return (
+ <Dialog open={open} onOpenChange={onOpenChange}>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>Update channel</DialogTitle>
+ <DialogDescription>
+ Update the channel name and icon
+ </DialogDescription>
+ </DialogHeader>
+ <ChannelForm
+ id={channel.id}
+ values={{
+ name: channel.attributes.name,
+ avatar: channel.attributes.avatar,
+ }}
+ isPending={isPending}
+ submitText="Update"
+ readOnly={!canEdit}
+ handleCancel={() => {
+ onOpenChange(false);
+ }}
+ handleSubmit={(values) => {
+ if (isPending) {
+ return;
+ }
+
+ mutate({
+ input: {
+ type: 'channel_update',
+ channelId: channel.id,
+ name: values.name,
+ avatar: values.avatar,
+ userId: workspace.userId,
+ },
+ onSuccess(output) {
+ onOpenChange(false);
+ toast({
+ title: 'Channel updated',
+ description: 'Channel was updated successfully',
+ variant: 'default',
+ });
+ },
+ });
+ }}
+ />
+ </DialogContent>
+ </Dialog>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx
new file mode 100644
index 00000000..91441824
--- /dev/null
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx
@@ -0,0 +1,40 @@
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { timeAgo } from '@/shared/lib/utils';
+
+interface NodeCollaboratorAuditProps {
+ collaboratorId: string;
+ date: string;
+}
+
+export const NodeCollaboratorAudit = ({
+ collaboratorId,
+ date,
+}: NodeCollaboratorAuditProps) => {
+ const workspace = useWorkspace();
+ const { data, isPending } = useQuery({
+ type: 'node_get',
+ nodeId: collaboratorId,
+ userId: workspace.userId,
+ });
+
+ if (isPending || !data || data.type !== 'user') {
+ return null;
+ }
+
+ return (
+ <div className="flex items-center gap-2 w-full">
+ <Avatar
+ id={data.id}
+ name={data.attributes.name}
+ avatar={data.attributes.avatar}
+ className="size-7"
+ />
+ <div className="flex flex-col">
+ <span className="font-medium flex-grow">{data.attributes.name}</span>
+ <span className="text-xs text-muted-foreground">{timeAgo(date)}</span>
+ </div>
+ </div>
+ );
+};
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 e958c7ed..b89efe27 100644
--- a/apps/desktop/src/renderer/components/spaces/space-update-form.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-update-form.tsx
@@ -93,7 +93,6 @@ export const SpaceUpdateForm = ({ space }: SpaceUpdateFormProps) => {
/>
</Button>
</AvatarPopover>
-
<FormField
control={form.control}
name="name"
diff --git a/apps/desktop/src/renderer/components/ui/button.tsx b/apps/desktop/src/renderer/components/ui/button.tsx
index e44fa78b..dd50fcdb 100644
--- a/apps/desktop/src/renderer/components/ui/button.tsx
+++ b/apps/desktop/src/renderer/components/ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
import { cn } from '@/shared/lib/utils';
const buttonVariants = cva(
- 'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:ring-0 disabled:pointer-events-none disabled:opacity-50',
+ 'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-0 focus-visible:outline-none focus-visible:ring-0 disabled:pointer-events-none disabled:opacity-50',
{
variants: {
variant: {
diff --git a/apps/desktop/src/shared/mutations/channel-create.ts b/apps/desktop/src/shared/mutations/channel-create.ts
index 8f126e59..eae7c790 100644
--- a/apps/desktop/src/shared/mutations/channel-create.ts
+++ b/apps/desktop/src/shared/mutations/channel-create.ts
@@ -3,6 +3,7 @@ export type ChannelCreateMutationInput = {
userId: string;
spaceId: string;
name: string;
+ avatar?: string;
};
export type ChannelCreateMutationOutput = {
diff --git a/apps/desktop/src/shared/mutations/channel-update.ts b/apps/desktop/src/shared/mutations/channel-update.ts
new file mode 100644
index 00000000..ceae7c1c
--- /dev/null
+++ b/apps/desktop/src/shared/mutations/channel-update.ts
@@ -0,0 +1,20 @@
+export type ChannelUpdateMutationInput = {
+ type: 'channel_update';
+ userId: string;
+ channelId: string;
+ name: string;
+ avatar?: string;
+};
+
+export type ChannelUpdateMutationOutput = {
+ success: boolean;
+};
+
+declare module '@/shared/mutations' {
+ interface MutationMap {
+ channel_update: {
+ input: ChannelUpdateMutationInput;
+ output: ChannelUpdateMutationOutput;
+ };
+ }
+}