Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Implement page update
Hakan Shehuc3801688d7ac
diff --git a/apps/desktop/src/main/mutations/index.ts b/apps/desktop/src/main/mutations/index.tsindex 578652a9..65a0df4e 100644--- a/apps/desktop/src/main/mutations/index.ts+++ b/apps/desktop/src/main/mutations/index.ts@@ -40,7 +40,7 @@ import { MarkNodeAsSeenMutationHandler } from '@/main/mutations/mark-node-as-seeimport { ViewUpdateMutationHandler } from '@/main/mutations/view-update';import { ViewDeleteMutationHandler } from '@/main/mutations/view-delete';import { ChannelUpdateMutationHandler } from '@/main/mutations/channel-update';-+import { PageUpdateMutationHandler } from '@/main/mutations/page-update';type MutationHandlerMap = {[K in keyof MutationMap]: MutationHandler<MutationMap[K]['input']>;};@@ -86,4 +86,5 @@ export const mutationHandlerMap: MutationHandlerMap = {view_update: new ViewUpdateMutationHandler(),view_delete: new ViewDeleteMutationHandler(),channel_update: new ChannelUpdateMutationHandler(),+ page_update: new PageUpdateMutationHandler(),};diff --git a/apps/desktop/src/main/mutations/page-create.ts b/apps/desktop/src/main/mutations/page-create.tsindex 0f942488..11c617af 100644--- a/apps/desktop/src/main/mutations/page-create.ts+++ b/apps/desktop/src/main/mutations/page-create.ts@@ -17,6 +17,7 @@ export class PageCreateMutationHandlerconst attributes: PageAttributes = {type: 'page',parentId: input.parentId,+ avatar: input.avatar,name: input.name,content: {},};diff --git a/apps/desktop/src/main/mutations/page-update.ts b/apps/desktop/src/main/mutations/page-update.tsnew file mode 100644index 00000000..0767efa0--- /dev/null+++ b/apps/desktop/src/main/mutations/page-update.ts@@ -0,0 +1,29 @@+import { MutationHandler } from '@/main/types';+import {+ PageUpdateMutationInput,+ PageUpdateMutationOutput,+} from '@/shared/mutations/page-update';+import { nodeService } from '@/main/services/node-service';++export class PageUpdateMutationHandler+ implements MutationHandler<PageUpdateMutationInput>+{+ async handleMutation(+ input: PageUpdateMutationInput+ ): Promise<PageUpdateMutationOutput> {+ await nodeService.updateNode(input.pageId, input.userId, (attributes) => {+ if (attributes.type !== 'page') {+ throw new Error('Node is not a page');+ }++ attributes.name = input.name;+ attributes.avatar = input.avatar;++ return attributes;+ });++ return {+ success: true,+ };+ }+}diff --git a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsxindex f09d8aff..9b1e9162 100644--- a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx@@ -8,7 +8,7 @@ import {} from '@/renderer/components/ui/dialog';import { useMutation } from '@/renderer/hooks/use-mutation';import { IdType } from '@colanode/core';-import { ChannelForm } from './channel-form';+import { ChannelForm } from '@/renderer/components/channels/channel-form';import { generateId } from '@colanode/core';interface ChannelCreateDialogProps {diff --git a/apps/desktop/src/renderer/components/channels/channel-form.tsx b/apps/desktop/src/renderer/components/channels/channel-form.tsxindex 0fbafdd4..15b81a03 100644--- a/apps/desktop/src/renderer/components/channels/channel-form.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-form.tsx@@ -4,7 +4,6 @@ import {FormControl,FormField,FormItem,- FormLabel,FormMessage,} from '@/renderer/components/ui/form';import { Button } from '@/renderer/components/ui/button';diff --git a/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsxindex a92db5ff..ecc1a88a 100644--- a/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx@@ -62,7 +62,7 @@ export const ChannelUpdateDialog = ({avatar: values.avatar,userId: workspace.userId,},- onSuccess(output) {+ onSuccess() {onOpenChange(false);toast({title: 'Channel updated',diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsxindex 91441824..56001cd8 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx@@ -32,7 +32,7 @@ export const NodeCollaboratorAudit = ({className="size-7"/><div className="flex flex-col">- <span className="font-medium flex-grow">{data.attributes.name}</span>+ <span className="font-normal 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/pages/page-create-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-create-dialog.tsxindex 484a01d6..9c39052b 100644--- a/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/pages/page-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 { PageForm } from '@/renderer/components/pages/page-form';+import { generateId } from '@colanode/core';interface PageCreateDialogProps {spaceId: string;@@ -41,35 +25,6 @@ export const PageCreateDialog = ({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>) => {- mutate({- input: {- type: 'page_create',- parentId: spaceId,- name: values.name,- generateIndex: true,- userId: workspace.userId,- },- onSuccess(output) {- onOpenChange(false);- form.reset();- workspace.openInMain(output.id);- },- });- };-return (<Dialog open={open} onOpenChange={onOpenChange}><DialogContent>@@ -79,37 +34,39 @@ export const PageCreateDialog = ({Create a new page 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" onClick={handleCancel}>- Cancel- </Button>- <Button type="submit" disabled={isPending}>- {isPending && <Spinner className="mr-1" />}- Create- </Button>- </DialogFooter>- </form>- </Form>+ <PageForm+ id={generateId(IdType.Page)}+ values={{+ name: '',+ avatar: null,+ }}+ isPending={isPending}+ submitText="Create"+ handleCancel={() => {+ onOpenChange(false);+ }}+ handleSubmit={(values) => {+ console.log('submit', values);+ if (isPending) {+ return;+ }++ mutate({+ input: {+ type: 'page_create',+ parentId: spaceId,+ name: values.name,+ avatar: values.avatar,+ userId: workspace.userId,+ generateIndex: true,+ },+ onSuccess(output) {+ onOpenChange(false);+ workspace.openInMain(output.id);+ },+ });+ }}+ /></DialogContent></Dialog>);diff --git a/apps/desktop/src/renderer/components/pages/page-form.tsx b/apps/desktop/src/renderer/components/pages/page-form.tsxnew file mode 100644index 00000000..f9fdc9b6--- /dev/null+++ b/apps/desktop/src/renderer/components/pages/page-form.tsx@@ -0,0 +1,109 @@+import { z } from 'zod';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ 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 PageFormProps {+ id: string;+ values: z.infer<typeof formSchema>;+ isPending: boolean;+ submitText: string;+ handleCancel: () => void;+ handleSubmit: (values: z.infer<typeof formSchema>) => void;+ readOnly?: boolean;+}++export const PageForm = ({+ id,+ values,+ isPending,+ submitText,+ handleCancel,+ handleSubmit,+ readOnly = false,+}: PageFormProps) => {+ 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/pages/page-header.tsx b/apps/desktop/src/renderer/components/pages/page-header.tsxindex 7116804c..7385689e 100644--- a/apps/desktop/src/renderer/components/pages/page-header.tsx+++ b/apps/desktop/src/renderer/components/pages/page-header.tsx@@ -30,7 +30,7 @@ export const PageHeader = ({ nodes, page, role }: PageHeaderProps) => {nodes={nodes}role={role}/>- <PageSettings nodeId={page.id} />+ <PageSettings page={page} role={role} /></div></div></Header>diff --git a/apps/desktop/src/renderer/components/pages/page-settings.tsx b/apps/desktop/src/renderer/components/pages/page-settings.tsxindex 1629f52d..1864ced1 100644--- a/apps/desktop/src/renderer/components/pages/page-settings.tsx+++ b/apps/desktop/src/renderer/components/pages/page-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 { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';+import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';+import { PageUpdateDialog } from '@/renderer/components/pages/page-update-dialog';import { PageDeleteDialog } from '@/renderer/components/pages/page-delete-dialog';interface PageSettingsProps {- nodeId: string;+ page: PageNode;+ role: NodeRole;}-export const PageSettings = ({ nodeId }: PageSettingsProps) => {- const [showDeleteModal, setShowDeleteModal] = React.useState(false);+export const PageSettings = ({ page, role }: PageSettingsProps) => {+ 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>{page.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 PageSettings = ({ nodeId }: PageSettingsProps) => {<DropdownMenuItemclassName="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={page.createdBy}+ date={page.createdAt}+ />+ </DropdownMenuItem>+ {page.updatedBy && (+ <React.Fragment>+ <DropdownMenuSeparator />+ <DropdownMenuLabel>Last updated by</DropdownMenuLabel>+ <DropdownMenuItem>+ <NodeCollaboratorAudit+ collaboratorId={page.updatedBy}+ date={page.updatedAt}+ />+ </DropdownMenuItem>+ </React.Fragment>+ )}</DropdownMenuContent></DropdownMenu><PageDeleteDialog- nodeId={nodeId}- open={showDeleteModal}+ nodeId={page.id}+ open={showDeleteDialog}onOpenChange={setShowDeleteModal}/>+ <PageUpdateDialog+ page={page}+ role={role}+ open={showUpdateDialog}+ onOpenChange={setShowUpdateDialog}+ /></React.Fragment>);};diff --git a/apps/desktop/src/renderer/components/pages/page-update-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-update-dialog.tsxnew file mode 100644index 00000000..d0ddc09d--- /dev/null+++ b/apps/desktop/src/renderer/components/pages/page-update-dialog.tsx@@ -0,0 +1,83 @@+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,+ PageNode,+} from '@colanode/core';+import { ChannelForm } from '@/renderer/components/channels/channel-form';+import { toast } from '@/renderer/hooks/use-toast';+import { PageForm } from './page-form';++interface PageUpdateDialogProps {+ page: PageNode;+ role: NodeRole;+ open: boolean;+ onOpenChange: (open: boolean) => void;+}++export const PageUpdateDialog = ({+ page,+ role,+ open,+ onOpenChange,+}: PageUpdateDialogProps) => {+ const workspace = useWorkspace();+ const { mutate, isPending } = useMutation();+ const canEdit = hasEditorAccess(role);++ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Update page</DialogTitle>+ <DialogDescription>Update the page name and icon</DialogDescription>+ </DialogHeader>+ <PageForm+ id={page.id}+ values={{+ name: page.attributes.name,+ avatar: page.attributes.avatar,+ }}+ isPending={isPending}+ submitText="Update"+ readOnly={!canEdit}+ handleCancel={() => {+ onOpenChange(false);+ }}+ handleSubmit={(values) => {+ if (isPending) {+ return;+ }++ mutate({+ input: {+ type: 'page_update',+ pageId: page.id,+ name: values.name,+ avatar: values.avatar,+ userId: workspace.userId,+ },+ onSuccess() {+ onOpenChange(false);+ toast({+ title: 'Page updated',+ description: 'Page was updated successfully',+ variant: 'default',+ });+ },+ });+ }}+ />+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/desktop/src/shared/mutations/page-create.ts b/apps/desktop/src/shared/mutations/page-create.tsindex 00ab9048..ae7e871a 100644--- a/apps/desktop/src/shared/mutations/page-create.ts+++ b/apps/desktop/src/shared/mutations/page-create.ts@@ -2,6 +2,7 @@ export type PageCreateMutationInput = {type: 'page_create';userId: string;parentId: string;+ avatar?: string | null;name: string;generateIndex: boolean;};diff --git a/apps/desktop/src/shared/mutations/page-update.ts b/apps/desktop/src/shared/mutations/page-update.tsnew file mode 100644index 00000000..49c90009--- /dev/null+++ b/apps/desktop/src/shared/mutations/page-update.ts@@ -0,0 +1,20 @@+export type PageUpdateMutationInput = {+ type: 'page_update';+ userId: string;+ pageId: string;+ avatar?: string | null;+ name: string;+};++export type PageUpdateMutationOutput = {+ success: boolean;+};++declare module '@/shared/mutations' {+ interface MutationMap {+ page_update: {+ input: PageUpdateMutationInput;+ output: PageUpdateMutationOutput;+ };+ }+}