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
Add authorization checks for document editor
Hakan Shehua8d8287e2757
diff --git a/apps/desktop/src/renderer/components/documents/document-editor.tsx b/apps/desktop/src/renderer/components/documents/document-editor.tsxindex f7b00437..aedd4805 100644--- a/apps/desktop/src/renderer/components/documents/document-editor.tsx+++ b/apps/desktop/src/renderer/components/documents/document-editor.tsx@@ -60,12 +60,14 @@ interface DocumentEditorProps {documentId: string;content: JSONContent;versionId: string;+ editable: boolean;}export const DocumentEditor = ({documentId,content,versionId,+ editable,}: DocumentEditorProps) => {const workspace = useWorkspace();const { mutate } = useMutation();@@ -155,6 +157,7 @@ export const DocumentEditor = ({},},content: content,+ editable,shouldRerenderOnTransaction: false,autofocus: 'start',onUpdate: async ({ editor, transaction }) => {@@ -192,7 +195,7 @@ export const DocumentEditor = ({return (<div className="min-h-[500px]">- {editor && (+ {editor && editable && (<React.Fragment><EditorBubbleMenu editor={editor} /></React.Fragment>diff --git a/apps/desktop/src/renderer/components/documents/document.tsx b/apps/desktop/src/renderer/components/documents/document.tsxindex f285994c..15321936 100644--- a/apps/desktop/src/renderer/components/documents/document.tsx+++ b/apps/desktop/src/renderer/components/documents/document.tsx@@ -6,9 +6,15 @@ interface DocumentProps {nodeId: string;content?: Record<string, Block> | null;versionId: string;+ editable: boolean;}-export const Document = ({ nodeId, content, versionId }: DocumentProps) => {+export const Document = ({+ nodeId,+ content,+ versionId,+ editable = false,+}: DocumentProps) => {const nodeBlocks = Object.values(content ?? {});const contents = mapBlocksToContents(nodeId, nodeBlocks);@@ -29,6 +35,7 @@ export const Document = ({ nodeId, content, versionId }: DocumentProps) => {documentId={nodeId}content={tiptapContent}versionId={versionId}+ editable={editable}/>);};diff --git a/apps/desktop/src/renderer/components/pages/page-body.tsx b/apps/desktop/src/renderer/components/pages/page-body.tsxindex 38ddddf8..773a55c3 100644--- a/apps/desktop/src/renderer/components/pages/page-body.tsx+++ b/apps/desktop/src/renderer/components/pages/page-body.tsx@@ -1,18 +1,22 @@-import { PageNode } from '@colanode/core';+import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';import { ScrollArea } from '@/renderer/components/ui/scroll-area';import { Document } from '@/renderer/components/documents/document';interface PageBodyProps {page: PageNode;+ role: NodeRole;}-export const PageBody = ({ page }: PageBodyProps) => {+export const PageBody = ({ page, role }: PageBodyProps) => {+ const canEdit = hasEditorAccess(role);+return (<ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12"><DocumentnodeId={page.id}content={page.attributes.content}versionId={page.versionId}+ editable={canEdit}/></ScrollArea>);diff --git a/apps/desktop/src/renderer/components/pages/page-container.tsx b/apps/desktop/src/renderer/components/pages/page-container.tsxindex e81f07b7..94791069 100644--- a/apps/desktop/src/renderer/components/pages/page-container.tsx+++ b/apps/desktop/src/renderer/components/pages/page-container.tsx@@ -31,7 +31,7 @@ export const PageContainer = ({ nodeId }: PageContainerProps) => {return (<div className="flex h-full w-full flex-col"><PageHeader nodes={nodes} page={page} role={role} />- <PageBody page={page} />+ <PageBody page={page} role={role} /></div>);};diff --git a/apps/desktop/src/renderer/components/records/record-body.tsx b/apps/desktop/src/renderer/components/records/record-body.tsxindex e506fa21..8897968d 100644--- a/apps/desktop/src/renderer/components/records/record-body.tsx+++ b/apps/desktop/src/renderer/components/records/record-body.tsx@@ -4,13 +4,16 @@ import { ScrollArea } from '@/renderer/components/ui/scroll-area';import { Document } from '@/renderer/components/documents/document';import { Separator } from '@/renderer/components/ui/separator';import { RecordProvider } from '@/renderer/components/records/record-provider';-import { RecordNode } from '@colanode/core';+import { hasEditorAccess, NodeRole, RecordNode } from '@colanode/core';interface RecordBodyProps {record: RecordNode;+ role: NodeRole;}-export const RecordBody = ({ record }: RecordBodyProps) => {+export const RecordBody = ({ record, role }: RecordBodyProps) => {+ const canEdit = hasEditorAccess(role);+return (<Database databaseId={record.attributes.databaseId}><ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">@@ -22,6 +25,7 @@ export const RecordBody = ({ record }: RecordBodyProps) => {nodeId={record.id}content={record.attributes.content}versionId={record.versionId}+ editable={canEdit}/></ScrollArea></Database>diff --git a/apps/desktop/src/renderer/components/records/record-container.tsx b/apps/desktop/src/renderer/components/records/record-container.tsxindex 45b7b617..c4caa958 100644--- a/apps/desktop/src/renderer/components/records/record-container.tsx+++ b/apps/desktop/src/renderer/components/records/record-container.tsx@@ -31,7 +31,7 @@ export const RecordContainer = ({ nodeId }: RecordContainerProps) => {return (<div className="flex h-full w-full flex-col"><RecordHeader nodes={nodes} record={record} role={role} />- <RecordBody record={record} />+ <RecordBody record={record} role={role} /></div>);};diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsxindex 74fe06b6..13bf28fa 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx@@ -52,7 +52,7 @@ export const Workspace = () => {openSettings() {setOpenSettings(true);},- markAsSeen(nodeId, versionId) {+ markAsSeen() {// window.colanode.executeMutation({// type: 'mark_node_as_seen',// nodeId: nodeId,