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
Fix some bugs with mutations and id generation in editor
Hakan Shehu344ac71501c3
diff --git a/desktop/src/editor/extensions/id.tsx b/desktop/src/editor/extensions/id.tsxindex d5775785..a790abe6 100644--- a/desktop/src/editor/extensions/id.tsx+++ b/desktop/src/editor/extensions/id.tsx@@ -1,21 +1,21 @@import { Extension } from '@tiptap/react';import { Plugin, PluginKey } from 'prosemirror-state';import { NeuronId } from '@/lib/id';-import { NodeTypes } from '@/lib/constants';+import { EditorNodeTypes } from '@/lib/constants';const types = [- NodeTypes.Paragraph,- NodeTypes.Heading1,- NodeTypes.Heading2,- NodeTypes.Heading3,- NodeTypes.Blockquote,- NodeTypes.BulletList,- NodeTypes.ListItem,- NodeTypes.OrderedList,- NodeTypes.TaskList,- NodeTypes.TaskItem,- NodeTypes.CodeBlock,- NodeTypes.HorizontalRule,+ EditorNodeTypes.Paragraph,+ EditorNodeTypes.Heading1,+ EditorNodeTypes.Heading2,+ EditorNodeTypes.Heading3,+ EditorNodeTypes.Blockquote,+ EditorNodeTypes.BulletList,+ EditorNodeTypes.ListItem,+ EditorNodeTypes.OrderedList,+ EditorNodeTypes.TaskList,+ EditorNodeTypes.TaskItem,+ EditorNodeTypes.CodeBlock,+ EditorNodeTypes.HorizontalRule,];export const IdExtension = Extension.create({diff --git a/desktop/src/electron/workspace-manager.ts b/desktop/src/electron/workspace-manager.tsindex 594213f6..2cceda4b 100644--- a/desktop/src/electron/workspace-manager.ts+++ b/desktop/src/electron/workspace-manager.ts@@ -280,17 +280,11 @@ export class WorkspaceManager {mutation: ServerMutation,): Promise<boolean> {if (mutation.action === 'insert' && mutation.after) {- return this.syncNodeFromServer(mutation.after);+ return this.createNodeFromServer(mutation.after);} else if (mutation.action === 'update' && mutation.after) {- return this.syncNodeFromServer(mutation.after);+ return this.updateNodeFromServer(mutation.after);} else if (mutation.action === 'delete' && mutation.before) {- await this.database- .deleteFrom('nodes')- .where('id', '=', mutation.before.id)- .execute();-- this.debouncedNotifyQuerySubscribers(['nodes']);- return true;+ return this.deleteNodeFromServer(mutation.before);}}@@ -424,74 +418,81 @@ export class WorkspaceManager {return false;}- public async syncNodeFromServer(node: ServerNode): Promise<boolean> {- try {- const existingNode = await this.database- .selectFrom('nodes')- .selectAll()- .where('id', '=', node.id)- .executeTakeFirst();-- if (!existingNode) {- await this.database- .insertInto('nodes')- .values({- id: node.id,- attributes: JSON.stringify(node.attributes),- state: node.state,- created_at: node.createdAt,- created_by: node.createdBy,- updated_by: node.updatedBy,- updated_at: node.updatedAt,- version_id: node.versionId,+ private async createNodeFromServer(node: ServerNode): Promise<boolean> {+ await this.database+ .insertInto('nodes')+ .values({+ id: node.id,+ attributes: JSON.stringify(node.attributes),+ state: node.state,+ created_at: node.createdAt,+ created_by: node.createdBy,+ updated_by: node.updatedBy,+ updated_at: node.updatedAt,+ version_id: node.versionId,+ server_created_at: node.serverCreatedAt,+ server_updated_at: node.serverUpdatedAt,+ server_version_id: node.versionId,+ })+ .onConflict((cb) =>+ cb+ .doUpdateSet({server_created_at: node.serverCreatedAt,server_updated_at: node.serverUpdatedAt,server_version_id: node.versionId,})- .onConflict((cb) => cb.doNothing())- .execute();+ .where('version_id', '=', node.versionId),+ )+ .execute();- this.debouncedNotifyQuerySubscribers(['nodes']);- return true;- }+ this.debouncedNotifyQuerySubscribers(['nodes']);+ return true;+ }- if (this.shouldUpdateNodeFromServer(existingNode, node)) {- const doc = new Y.Doc({- guid: node.id,- });+ private async updateNodeFromServer(node: ServerNode): Promise<boolean> {+ const existingNode = await this.database+ .selectFrom('nodes')+ .selectAll()+ .where('id', '=', node.id)+ .executeTakeFirst();++ if (!this.shouldUpdateNodeFromServer(existingNode, node)) {+ return true;+ }+ const doc = new Y.Doc({+ guid: node.id,+ });- Y.applyUpdate(doc, toUint8Array(existingNode.state));- Y.applyUpdate(doc, toUint8Array(node.state));+ Y.applyUpdate(doc, toUint8Array(existingNode.state));+ Y.applyUpdate(doc, toUint8Array(node.state));- const attributesMap = doc.getMap('attributes');- const attributes = JSON.stringify(attributesMap.toJSON());- const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));+ const attributesMap = doc.getMap('attributes');+ const attributes = JSON.stringify(attributesMap.toJSON());+ const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));- await this.database- .updateTable('nodes')- .set({- attributes: attributes,- state: encodedState,- updated_at: node.updatedAt,- updated_by: node.updatedBy,- version_id: node.versionId,- server_created_at: node.serverCreatedAt,- server_updated_at: node.serverUpdatedAt,- server_version_id: node.versionId,- })- .where('id', '=', node.id)- .execute();+ await this.database+ .updateTable('nodes')+ .set({+ attributes: attributes,+ state: encodedState,+ updated_at: node.updatedAt,+ updated_by: node.updatedBy,+ version_id: node.versionId,+ server_created_at: node.serverCreatedAt,+ server_updated_at: node.serverUpdatedAt,+ server_version_id: node.versionId,+ })+ .where('id', '=', node.id)+ .execute();- this.debouncedNotifyQuerySubscribers(['nodes']);- return true;- }- } catch (error) {- if (error.code === 'SQLITE_CONSTRAINT_FOREIGNKEY') {- return true;- }- }+ this.debouncedNotifyQuerySubscribers(['nodes']);+ return true;+ }- return false;+ private async deleteNodeFromServer(node: ServerNode): Promise<boolean> {+ await this.database.deleteFrom('nodes').where('id', '=', node.id).execute();+ this.debouncedNotifyQuerySubscribers(['nodes']);+ return true;}public async syncNodeCollaboratorFromServer(diff --git a/server/src/mutations/node-collaborators.ts b/server/src/mutations/node-collaborators.tsindex f3464513..610841c9 100644--- a/server/src/mutations/node-collaborators.ts+++ b/server/src/mutations/node-collaborators.ts@@ -42,6 +42,7 @@ const handleCreateNodeCollaboratorMutation = async (workspaceAccount,nodeCollaboratorData,);+if (!canCreate) {return {status: 'error',