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
Transaction sync fixes
Hakan Shehuc0f58fc07304
diff --git a/desktop/src/components/messages/message-delete-button.tsx b/desktop/src/components/messages/message-delete-button.tsxindex 70657134..d5ffe0ef 100644--- a/desktop/src/components/messages/message-delete-button.tsx+++ b/desktop/src/components/messages/message-delete-button.tsx@@ -10,6 +10,7 @@ import {} from '@/components/ui/alert-dialog';import { Button } from '@/components/ui/button';import { Icon } from '@/components/ui/icon';+import { useWorkspace } from '@/contexts/workspace';interface MessageDeleteButtonProps {id: string;@@ -17,6 +18,7 @@ interface MessageDeleteButtonProps {export const MessageDeleteButton = ({ id }: MessageDeleteButtonProps) => {const [showDeleteModal, setShowDeleteModal] = React.useState(false);+ const workspace = useWorkspace();return (<React.Fragment>@@ -34,7 +36,13 @@ export const MessageDeleteButton = ({ id }: MessageDeleteButtonProps) => {</AlertDialogHeader><AlertDialogFooter><AlertDialogCancel>Cancel</AlertDialogCancel>- <Button variant="destructive" onClick={() => {}}>+ <Button+ variant="destructive"+ onClick={async () => {+ await workspace.deleteNode(id);+ setShowDeleteModal(false);+ }}+ >Delete</Button></AlertDialogFooter>diff --git a/desktop/src/electron/database/global/index.ts b/desktop/src/electron/database/global/index.tsindex 355c8499..f93cde17 100644--- a/desktop/src/electron/database/global/index.ts+++ b/desktop/src/electron/database/global/index.ts@@ -183,14 +183,13 @@ export class GlobalDatabase {const transactionsMap = new Map<string, Transaction[]>();transactions.forEach((transaction) => {- const input = JSON.parse(transaction.input);const transactionObj = {id: transaction.id,workspaceId: transaction.workspace_id,accountId: transaction.account_id,type: transaction.type,nodeId: transaction.node_id,- input: input,+ input: transaction.input,createdAt: new Date(transaction.created_at),};diff --git a/desktop/src/electron/database/workspace/index.ts b/desktop/src/electron/database/workspace/index.tsindex dab84fe6..ae63c3f3 100644--- a/desktop/src/electron/database/workspace/index.ts+++ b/desktop/src/electron/database/workspace/index.ts@@ -150,7 +150,7 @@ export class WorkspaceDatabase {type: 'delete_node',workspaceId: this.workspaceId,accountId: this.accountId,- input: null,+ input: JSON.stringify({ nodeId }),createdAt: new Date(),});};diff --git a/desktop/src/types/transactions.ts b/desktop/src/types/transactions.tsindex 0c0ccaaa..d4d0c648 100644--- a/desktop/src/types/transactions.ts+++ b/desktop/src/types/transactions.ts@@ -6,31 +6,10 @@ export type Transaction = {accountId: string;type: string;nodeId: string;- input: any;+ input: string;createdAt: Date;};-export type CreateNodeTransactionInput = {- id: string;- parentId?: string;- type: string;- attrs?: Record<string, any>;- createdAt: Date;- createdBy: string;-};--export type UpdateNodeTransactionInput = {- id: string;- parentId?: string;- attrs: Record<string, any>;- updatedAt: Date;- updatedBy: string;-};--export type DeleteNodeTransactionInput = {- id: string;-};-export type AccountTransactions = {account: Account;transactions: Transaction[];diff --git a/server/src/routes/transactions.ts b/server/src/routes/transactions.tsindex b51ab513..6cfb77b3 100644--- a/server/src/routes/transactions.ts+++ b/server/src/routes/transactions.ts@@ -1,10 +1,6 @@import { Request, Response } from 'express';-import {- isCreateNodeTransaction,- isDeleteNodeTransaction,- isUpdateNodeTransaction,- Transaction,-} from '@/types/transactions';+import { Transaction } from '@/types/transactions';+import { Node } from '@/types/nodes';import { prisma } from '@/data/db';const applyTransactions = async (req: Request, res: Response) => {@@ -12,41 +8,44 @@ const applyTransactions = async (req: Request, res: Response) => {const appliedTransactionIds: string[] = [];for (const transaction of transactions) {- if (isCreateNodeTransaction(transaction)) {- // create node+ if (transaction.type === 'create_node') {+ const node = JSON.parse(transaction.input) as Node;await prisma.nodes.create({data: {- id: transaction.input.id,- parentId: transaction.input.parentId,- workspaceId: transaction.workspaceId,- type: transaction.input.type,- attrs: transaction.input.attrs,- createdAt: transaction.input.createdAt,- createdBy: transaction.input.createdBy,- versionId: transaction.id,+ id: node.id,+ parentId: node.parentId,+ workspaceId: node.workspaceId,+ type: node.type,+ attrs: node.attrs,+ createdAt: node.createdAt,+ createdBy: node.createdBy,+ versionId: node.versionId,+ content: JSON.stringify(node.content),},});appliedTransactionIds.push(transaction.id);- } else if (isUpdateNodeTransaction(transaction)) {+ } else if (transaction.type === 'update_node') {+ const node = JSON.parse(transaction.input) as Node;await prisma.nodes.update({where: {- id: transaction.input.id,+ id: node.id,},data: {- parentId: transaction.input.parentId,- attrs: transaction.input.attrs,- updatedAt: transaction.input.updatedAt,- updatedBy: transaction.input.updatedBy,+ parentId: node.parentId,+ attrs: node.attrs,+ content: JSON.stringify(node.content),+ updatedAt: node.updatedAt,+ updatedBy: node.updatedBy,},});appliedTransactionIds.push(transaction.id);- } else if (isDeleteNodeTransaction(transaction)) {+ } else if (transaction.type === 'delete_node') {// delete nodeawait prisma.nodes.delete({where: {- id: transaction.input.id,+ id: transaction.nodeId,},});diff --git a/server/src/routes/workspaces.ts b/server/src/routes/workspaces.tsindex f68b3c35..7a1f187e 100644--- a/server/src/routes/workspaces.ts+++ b/server/src/routes/workspaces.ts@@ -10,7 +10,6 @@ import {import { ApiError, NeuronRequest, NeuronResponse } from '@/types/api';import { generateId, IdType } from '@/lib/id';import { prisma } from '@/data/db';-import { Node } from '@/types/nodes';const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {const input: WorkspaceInput = req.body;@@ -54,20 +53,6 @@ const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {};const userNodeId = generateId(IdType.User);- const userNode: Node = {- id: userNodeId,- workspaceId: workspace.id,- type: 'user',- attrs: {- id: account.id,- name: account.name,- avatar: account.avatar,- },- createdAt: new Date(),- createdBy: userNodeId,- versionId: generateId(IdType.Version),- };-const workspaceAccount: WorkspaceAccount = {accountId: req.accountId,workspaceId: workspace.id,@@ -84,7 +69,19 @@ const createWorkspace = async (req: NeuronRequest, res: NeuronResponse) => {data: workspace,}),prisma.nodes.create({- data: userNode,+ data: {+ id: userNodeId,+ workspaceId: workspace.id,+ type: 'user',+ attrs: {+ id: account.id,+ name: account.name,+ avatar: account.avatar,+ },+ createdAt: new Date(),+ createdBy: userNodeId,+ versionId: generateId(IdType.Version),+ },}),prisma.workspaceAccounts.create({data: workspaceAccount,diff --git a/server/src/types/nodes.ts b/server/src/types/nodes.tsindex 1f0837dc..1f2f63ef 100644--- a/server/src/types/nodes.ts+++ b/server/src/types/nodes.ts@@ -4,10 +4,22 @@ export type Node = {parentId?: string;type: string;attrs: any;- content?: any;+ content?: NodeContent[] | null;createdAt: Date;createdBy: string;updatedAt?: Date | null;updatedBy?: string | null;versionId: string;};++export type NodeContent = {+ type: string;+ id?: string | null;+ text?: string | null;+ marks?: NodeContentMark[];+};++export type NodeContentMark = {+ type: string;+ attrs: any;+};diff --git a/server/src/types/transactions.ts b/server/src/types/transactions.tsindex 2e7c889d..12b68082 100644--- a/server/src/types/transactions.ts+++ b/server/src/types/transactions.ts@@ -1,53 +1,9 @@-export interface Transaction {+export type Transaction = {id: string;workspaceId: string;+ accountId: string;type: string;-}--export type CreateNodeTransaction = Transaction & {- type: 'create_node';- input: {- id: string;- parentId?: string;- type: string;- attrs?: Record<string, any>;- createdAt: Date;- createdBy: string;- };-};--export const isCreateNodeTransaction = (- transaction: Transaction,-): transaction is CreateNodeTransaction => {- return transaction.type === 'create_node';-};--export type UpdateNodeTransaction = Transaction & {- type: 'update_node';- input: {- id: string;- parentId?: string;- attrs: Record<string, any>;- updatedAt: Date;- updatedBy: string;- };-};--export const isUpdateNodeTransaction = (- transaction: Transaction,-): transaction is UpdateNodeTransaction => {- return transaction.type === 'update_node';-};--export type DeleteNodeTransaction = Transaction & {- type: 'delete_node';- input: {- id: string;- };-};--export const isDeleteNodeTransaction = (- transaction: Transaction,-): transaction is DeleteNodeTransaction => {- return transaction.type === 'delete_node';+ nodeId: string;+ input: string;+ createdAt: Date;};