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
Rebane 'nodes' into 'folder name'
Hakan Shehu32c72c260773
diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.tsindex 1808d53f..2ddbd8b6 100644--- a/apps/desktop/src/main/data/workspace/migrations.ts+++ b/apps/desktop/src/main/data/workspace/migrations.ts@@ -22,10 +22,10 @@ const createUsersTable: Migration = {},};-const createNodesTable: Migration = {+const createEntriesTable: Migration = {up: async (db) => {await db.schema- .createTable('nodes')+ .createTable('entries').addColumn('id', 'text', (col) => col.primaryKey().notNull()).addColumn('type', 'text', (col) =>col@@ -49,11 +49,11 @@ const createNodesTable: Migration = {.execute();await sql`- CREATE INDEX IF NOT EXISTS "nodes_parent_id_type_index" ON "nodes" ("parent_id", "type");+ CREATE INDEX IF NOT EXISTS "entries_parent_id_type_index" ON "entries" ("parent_id", "type");`.execute(db);},down: async (db) => {- await db.schema.dropTable('nodes').execute();+ await db.schema.dropTable('entries').execute();},};@@ -62,7 +62,7 @@ const createTransactionsTable: Migration = {await db.schema.createTable('transactions').addColumn('id', 'text', (col) => col.notNull().primaryKey())- .addColumn('node_id', 'text', (col) => col.notNull())+ .addColumn('entry_id', 'text', (col) => col.notNull()).addColumn('root_id', 'text', (col) => col.notNull()).addColumn('operation', 'text', (col) => col.notNull()).addColumn('data', 'blob')@@ -81,7 +81,7 @@ const createCollaborationsTable: Migration = {up: async (db) => {await db.schema.createTable('collaborations')- .addColumn('node_id', 'text', (col) => col.notNull().primaryKey())+ .addColumn('entry_id', 'text', (col) => col.notNull().primaryKey()).addColumn('role', 'text').addColumn('created_at', 'text', (col) => col.notNull()).addColumn('updated_at', 'text')@@ -101,7 +101,7 @@ const createMessagesTable: Migration = {.addColumn('id', 'text', (col) => col.notNull().primaryKey()).addColumn('type', 'text', (col) => col.notNull()).addColumn('parent_id', 'text', (col) => col.notNull())- .addColumn('node_id', 'text', (col) => col.notNull())+ .addColumn('entry_id', 'text', (col) => col.notNull()).addColumn('root_id', 'text', (col) => col.notNull()).addColumn('content', 'text', (col) => col.notNull()).addColumn('created_at', 'text', (col) => col.notNull())@@ -145,6 +145,7 @@ const createFilesTable: Migration = {.addColumn('id', 'text', (col) => col.notNull().primaryKey()).addColumn('type', 'text', (col) => col.notNull()).addColumn('parent_id', 'text', (col) => col.notNull())+ .addColumn('entry_id', 'text', (col) => col.notNull()).addColumn('root_id', 'text', (col) => col.notNull()).addColumn('name', 'text', (col) => col.notNull()).addColumn('original_name', 'text', (col) => col.notNull())@@ -201,117 +202,65 @@ const createMutationsTable: Migration = {},};-const createInteractionsTable: Migration = {- up: async (db) => {- await db.schema- .createTable('interactions')- .addColumn('user_id', 'text', (col) => col.notNull())- .addColumn('node_id', 'text', (col) => col.notNull())- .addColumn('attributes', 'text')- .addColumn('last_seen_at', 'text', (col) =>- col- .generatedAlwaysAs(sql`json_extract(attributes, '$.lastSeenAt')`)- .stored()- )- .addColumn('last_opened_at', 'text', (col) =>- col- .generatedAlwaysAs(sql`json_extract(attributes, '$.lastOpenedAt')`)- .stored()- )- .addColumn('created_at', 'text', (col) => col.notNull())- .addColumn('updated_at', 'text')- .addColumn('server_created_at', 'text')- .addColumn('server_updated_at', 'text')- .addColumn('version', 'integer', (col) => col.notNull())- .addPrimaryKeyConstraint('interactions_pkey', ['user_id', 'node_id'])- .execute();- },- down: async (db) => {- await db.schema.dropTable('interactions').execute();- },-};--const createInteractionEventsTable: Migration = {- up: async (db) => {- await db.schema- .createTable('interaction_events')- .addColumn('node_id', 'text', (col) => col.notNull())- .addColumn('attribute', 'text', (col) => col.notNull())- .addColumn('value', 'text', (col) => col.notNull())- .addColumn('created_at', 'text', (col) => col.notNull())- .addColumn('sent_at', 'text')- .addColumn('sent_count', 'integer', (col) => col.defaultTo(0))- .addColumn('event_id', 'text', (col) => col.notNull())- .addPrimaryKeyConstraint('interaction_events_pkey', [- 'node_id',- 'attribute',- ])- .execute();- },- down: async (db) => {- await db.schema.dropTable('interaction_events').execute();- },-};--const createNodePathsTable: Migration = {+const createEntryPathsTable: Migration = {up: async (db) => {await db.schema- .createTable('node_paths')+ .createTable('entry_paths').addColumn('ancestor_id', 'varchar(30)', (col) =>- col.notNull().references('nodes.id').onDelete('cascade')+ col.notNull().references('entries.id').onDelete('cascade')).addColumn('descendant_id', 'varchar(30)', (col) =>- col.notNull().references('nodes.id').onDelete('cascade')+ col.notNull().references('entries.id').onDelete('cascade')).addColumn('level', 'integer', (col) => col.notNull())- .addPrimaryKeyConstraint('node_paths_pkey', [+ .addPrimaryKeyConstraint('entry_paths_pkey', ['ancestor_id','descendant_id',]).execute();await sql`- CREATE TRIGGER trg_insert_node_path- AFTER INSERT ON nodes+ CREATE TRIGGER trg_insert_entry_path+ AFTER INSERT ON entriesFOR EACH ROWBEGIN- -- Insert direct path from the new node to itself- INSERT INTO node_paths (ancestor_id, descendant_id, level)+ -- Insert direct path from the new entry to itself+ INSERT INTO entry_paths (ancestor_id, descendant_id, level)VALUES (NEW.id, NEW.id, 0);- -- Insert paths from ancestors to the new node- INSERT INTO node_paths (ancestor_id, descendant_id, level)+ -- Insert paths from ancestors to the new entry+ INSERT INTO entry_paths (ancestor_id, descendant_id, level)SELECT ancestor_id, NEW.id, level + 1- FROM node_paths+ FROM entry_pathsWHERE descendant_id = NEW.parent_id AND ancestor_id <> NEW.id;END;`.execute(db);await sql`- CREATE TRIGGER trg_update_node_path- AFTER UPDATE ON nodes+ CREATE TRIGGER trg_update_entry_path+ AFTER UPDATE ON entriesFOR EACH ROWWHEN OLD.parent_id <> NEW.parent_idBEGIN- -- Delete old paths involving the updated node- DELETE FROM node_paths+ -- Delete old paths involving the updated entry+ DELETE FROM entry_pathsWHERE descendant_id = NEW.id AND ancestor_id <> NEW.id;- -- Insert new paths from ancestors to the updated node- INSERT INTO node_paths (ancestor_id, descendant_id, level)+ -- Insert new paths from ancestors to the updated entry+ INSERT INTO entry_paths (ancestor_id, descendant_id, level)SELECT ancestor_id, NEW.id, level + 1- FROM node_paths+ FROM entry_pathsWHERE descendant_id = NEW.parent_id AND ancestor_id <> NEW.id;END;`.execute(db);},down: async (db) => {await sql`- DROP TRIGGER IF EXISTS trg_insert_node_path;- DROP TRIGGER IF EXISTS trg_update_node_path;+ DROP TRIGGER IF EXISTS trg_insert_entry_path;+ DROP TRIGGER IF EXISTS trg_update_entry_path;`.execute(db);- await db.schema.dropTable('node_paths').execute();+ await db.schema.dropTable('entry_paths').execute();},};@@ -358,18 +307,16 @@ const createCursorsTable: Migration = {export const workspaceDatabaseMigrations: Record<string, Migration> = {'00001_create_users_table': createUsersTable,- '00002_create_nodes_table': createNodesTable,+ '00002_create_entries_table': createEntriesTable,'00003_create_transactions_table': createTransactionsTable,'00004_create_collaborations_table': createCollaborationsTable,'00005_create_messages_table': createMessagesTable,'00006_create_message_reactions_table': createMessageReactionsTable,'00007_create_files_table': createFilesTable,'00008_create_file_states_table': createFileStatesTable,- '00009_create_interactions_table': createInteractionsTable,- '00010_create_interaction_events_table': createInteractionEventsTable,- '00011_create_mutations_table': createMutationsTable,- '00012_create_node_paths_table': createNodePathsTable,- '00013_create_node_names_table': createNodeNamesTable,- '00014_create_node_texts_table': createNodeTextsTable,- '00015_create_cursors_table': createCursorsTable,+ '00009_create_mutations_table': createMutationsTable,+ '00010_create_entry_paths_table': createEntryPathsTable,+ '00011_create_node_names_table': createNodeNamesTable,+ '00012_create_node_texts_table': createNodeTextsTable,+ '00013_create_cursors_table': createCursorsTable,};diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.tsindex aa0fbbe2..902d6894 100644--- a/apps/desktop/src/main/data/workspace/schema.ts+++ b/apps/desktop/src/main/data/workspace/schema.ts@@ -1,10 +1,9 @@import {FileStatus,FileType,- InteractionAttribute,MessageType,MutationType,- NodeType,+ EntryType,WorkspaceRole,} from '@colanode/core';import { ColumnType, Insertable, Selectable, Updateable } from 'kysely';@@ -29,9 +28,9 @@ export type SelectUser = Selectable<UserTable>;export type CreateUser = Insertable<UserTable>;export type UpdateUser = Updateable<UserTable>;-interface NodeTable {+interface EntryTable {id: ColumnType<string, string, never>;- type: ColumnType<NodeType, never, never>;+ type: ColumnType<EntryType, never, never>;parent_id: ColumnType<string, never, never>;root_id: ColumnType<string, string, never>;attributes: ColumnType<string, string, string>;@@ -42,21 +41,21 @@ interface NodeTable {transaction_id: ColumnType<string, string, string>;}-export type SelectNode = Selectable<NodeTable>;-export type CreateNode = Insertable<NodeTable>;-export type UpdateNode = Updateable<NodeTable>;+export type SelectEntry = Selectable<EntryTable>;+export type CreateEntry = Insertable<EntryTable>;+export type UpdateEntry = Updateable<EntryTable>;-interface NodePathTable {+interface EntryPathTable {ancestor_id: ColumnType<string, string, never>;descendant_id: ColumnType<string, string, never>;level: ColumnType<number, number, number>;}-export type SelectNodePath = Selectable<NodePathTable>;+export type SelectEntryPath = Selectable<EntryPathTable>;interface TransactionTable {id: ColumnType<string, string, never>;- node_id: ColumnType<string, string, never>;+ entry_id: ColumnType<string, string, never>;root_id: ColumnType<string, string, never>;operation: ColumnType<string, string, never>;data: ColumnType<Uint8Array | null, Uint8Array | null, never>;@@ -71,7 +70,7 @@ export type CreateTransaction = Insertable<TransactionTable>;export type UpdateTransaction = Updateable<TransactionTable>;interface CollaborationTable {- node_id: ColumnType<string, string, never>;+ entry_id: ColumnType<string, string, never>;role: ColumnType<string, string, string>;created_at: ColumnType<string, string, never>;updated_at: ColumnType<string | null, string | null, string | null>;@@ -83,28 +82,11 @@ export type SelectCollaboration = Selectable<CollaborationTable>;export type CreateCollaboration = Insertable<CollaborationTable>;export type UpdateCollaboration = Updateable<CollaborationTable>;-interface InteractionTable {- user_id: ColumnType<string, string, never>;- node_id: ColumnType<string, string, never>;- attributes: ColumnType<string, string, string>;- last_seen_at: ColumnType<string | null, string | null, string | null>;- last_opened_at: ColumnType<string | null, string | null, string | null>;- created_at: ColumnType<string, string, never>;- updated_at: ColumnType<string | null, string | null, string | null>;- server_created_at: ColumnType<string | null, string | null, string | null>;- server_updated_at: ColumnType<string | null, string | null, string | null>;- version: ColumnType<bigint | null, bigint | null, bigint | null>;-}--export type SelectInteraction = Selectable<InteractionTable>;-export type CreateInteraction = Insertable<InteractionTable>;-export type UpdateInteraction = Updateable<InteractionTable>;-interface MessageTable {id: ColumnType<string, string, never>;type: ColumnType<MessageType, MessageType, MessageType>;parent_id: ColumnType<string, string, string>;- node_id: ColumnType<string, string, string>;+ entry_id: ColumnType<string, string, string>;root_id: ColumnType<string, string, string>;content: ColumnType<string, string, string>;created_at: ColumnType<string, string, never>;@@ -135,6 +117,7 @@ interface FileTable {id: ColumnType<string, string, never>;type: ColumnType<FileType, FileType, FileType>;parent_id: ColumnType<string, string, string>;+ entry_id: ColumnType<string, string, string>;root_id: ColumnType<string, string, string>;name: ColumnType<string, string, string>;original_name: ColumnType<string, string, string>;@@ -169,20 +152,6 @@ export type SelectFileState = Selectable<FileStateTable>;export type CreateFileState = Insertable<FileStateTable>;export type UpdateFileState = Updateable<FileStateTable>;-interface InteractionEventTable {- node_id: ColumnType<string, string, never>;- attribute: ColumnType<InteractionAttribute, string, string>;- value: ColumnType<string, string, string>;- created_at: ColumnType<string, string, never>;- sent_at: ColumnType<string | null, string | null, string | null>;- sent_count: ColumnType<number, number, number>;- event_id: ColumnType<string, string, string>;-}--export type SelectInteractionEvent = Selectable<InteractionEventTable>;-export type CreateInteractionEvent = Insertable<InteractionEventTable>;-export type UpdateInteractionEvent = Updateable<InteractionEventTable>;-interface MutationTable {id: ColumnType<string, string, never>;type: ColumnType<MutationType, MutationType, never>;@@ -223,12 +192,10 @@ interface CursorTable {export interface WorkspaceDatabaseSchema {users: UserTable;- nodes: NodeTable;+ entries: EntryTable;transactions: TransactionTable;- node_paths: NodePathTable;+ entry_paths: EntryPathTable;collaborations: CollaborationTable;- interactions: InteractionTable;- interaction_events: InteractionEventTable;messages: MessageTable;message_reactions: MessageReactionTable;files: FileTable;diff --git a/apps/desktop/src/main/jobs/revert-invalid-transactions.ts b/apps/desktop/src/main/jobs/revert-invalid-transactions.tsindex d1acaf98..6ee899e4 100644--- a/apps/desktop/src/main/jobs/revert-invalid-transactions.ts+++ b/apps/desktop/src/main/jobs/revert-invalid-transactions.ts@@ -1,4 +1,4 @@-// import { nodeService } from '@/main/services/node-service';+// import { entryService } from '@/main/services/entry-service';// import { createDebugger } from '@/main/debugger';// import { databaseService } from '@/main/data/database-service';// import { JobHandler } from '@/main/jobs';@@ -50,11 +50,11 @@// const transaction = mapTransaction(transactionRow);// if (transaction.operation === 'create') {-// await nodeService.revertCreateTransaction(input.userId, transaction);+// await entryService.revertCreateTransaction(input.userId, transaction);// } else if (transaction.operation === 'update') {-// await nodeService.revertUpdateTransaction(input.userId, transaction);+// await entryService.revertUpdateTransaction(input.userId, transaction);// } else if (transaction.operation === 'delete') {-// await nodeService.revertDeleteTransaction(input.userId, transaction);+// await entryService.revertDeleteTransaction(input.userId, transaction);// }// }// }diff --git a/apps/desktop/src/main/jobs/sync-pending-interactions.ts b/apps/desktop/src/main/jobs/sync-pending-interactions.tsdeleted file mode 100644index affc1410..00000000--- a/apps/desktop/src/main/jobs/sync-pending-interactions.ts+++ /dev/null@@ -1,146 +0,0 @@-import { SyncInteractionsMessage } from '@colanode/core';-import { sql } from 'kysely';--import { SelectInteractionEvent } from '@/main/data/workspace/schema';-import { socketService } from '@/main/services/socket-service';-import { fetchWorkspaceCredentials } from '@/main/utils';-import { createDebugger } from '@/main/debugger';-import { databaseService } from '@/main/data/database-service';-import { serverService } from '@/main/services/server-service';-import { JobHandler } from '@/main/jobs';--export type SyncPendingInteractionsInput = {- type: 'sync_pending_interactions';- userId: string;-};--declare module '@/main/jobs' {- interface JobMap {- sync_pending_interactions: {- input: SyncPendingInteractionsInput;- };- }-}--export class SyncPendingInteractionsJobHandler- implements JobHandler<SyncPendingInteractionsInput>-{- public triggerDebounce = 100;- public interval = 1000 * 60;-- private readonly debug = createDebugger('job:sync-pending-interactions');-- public async handleJob(input: SyncPendingInteractionsInput) {- if (this.triggerDebounce === 100) {- return;- }-- this.debug(`Sending local pending interactions for user ${input.userId}`);-- const workspaceDatabase = await databaseService.getWorkspaceDatabase(- input.userId- );-- const credentials = await fetchWorkspaceCredentials(input.userId);- if (!credentials) {- this.debug(- `No workspace credentials found for user ${input.userId}, skipping sending local pending interactions`- );- return;- }-- if (!serverService.isAvailable(credentials.serverDomain)) {- this.debug(- `Server ${credentials.serverDomain} is not available, skipping sending local pending interactions`- );- return;- }-- const cutoff = new Date(Date.now() - 1000 * 60 * 5).toISOString();- let cursor = '0';- let hasMore = true;-- while (hasMore) {- const interactionEvents = await workspaceDatabase- .selectFrom('interaction_events')- .selectAll()- .where((eb) =>- eb.or([eb('sent_at', 'is', null), eb('sent_at', '<', cutoff)])- )- .where('event_id', '>', cursor)- .limit(50)- .execute();-- if (interactionEvents.length === 0) {- this.debug(- `No local pending interactions found for user ${input.userId}, stopping sync`- );- hasMore = false;- break;- }-- this.debug(- `Sending ${interactionEvents.length} local pending interactions for user ${input.userId}`- );-- const groupedByNodeId: Record<string, SelectInteractionEvent[]> = {};- for (const event of interactionEvents) {- groupedByNodeId[event.node_id] = [- ...(groupedByNodeId[event.node_id] ?? []),- event,- ];-- cursor = event.event_id;- }-- const sentEventIds: string[] = [];- for (const [nodeId, events] of Object.entries(groupedByNodeId)) {- if (events.length === 0) {- continue;- }-- const firstEvent = events[0];- if (!firstEvent) {- continue;- }-- const message: SyncInteractionsMessage = {- type: 'sync_interactions',- nodeId,- rootId: firstEvent.node_id,- userId: credentials.userId,- events: events.map((e) => ({- attribute: e.attribute,- value: e.value,- createdAt: e.created_at,- })),- };-- const sent = socketService.sendMessage(credentials.accountId, message);- if (sent) {- sentEventIds.push(...events.map((e) => e.event_id));- }- }-- if (sentEventIds.length > 0) {- this.debug(- `Marking ${sentEventIds.length} local pending interactions as sent for user ${input.userId}`- );-- await workspaceDatabase- .updateTable('interaction_events')- .set({- sent_at: new Date().toISOString(),- sent_count: sql`sent_count + 1`,- })- .where('event_id', 'in', sentEventIds)- .execute();-- await workspaceDatabase- .deleteFrom('interaction_events')- .where('sent_count', '>', 20)- .execute();- }- }- }-}diff --git a/apps/desktop/src/main/mutations/channels/channel-create.ts b/apps/desktop/src/main/mutations/channels/channel-create.tsindex 3bd88669..145cf584 100644--- a/apps/desktop/src/main/mutations/channels/channel-create.ts+++ b/apps/desktop/src/main/mutations/channels/channel-create.ts@@ -1,7 +1,7 @@import { ChannelAttributes, generateId, IdType } from '@colanode/core';import { databaseService } from '@/main/data/database-service';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {ChannelCreateMutationInput,@@ -20,7 +20,7 @@ export class ChannelCreateMutationHandler);const space = await workspaceDatabase- .selectFrom('nodes')+ .selectFrom('entries').selectAll().where('id', '=', input.spaceId).executeTakeFirst();@@ -41,7 +41,7 @@ export class ChannelCreateMutationHandlercollaborators: null,};- await nodeService.createNode(input.userId, { id, attributes });+ await entryService.createEntry(input.userId, { id, attributes });return {id: id,diff --git a/apps/desktop/src/main/mutations/channels/channel-delete.ts b/apps/desktop/src/main/mutations/channels/channel-delete.tsindex 21865e0b..1b4c51cf 100644--- a/apps/desktop/src/main/mutations/channels/channel-delete.ts+++ b/apps/desktop/src/main/mutations/channels/channel-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {ChannelDeleteMutationInput,@@ -11,7 +11,7 @@ export class ChannelDeleteMutationHandlerasync handleMutation(input: ChannelDeleteMutationInput): Promise<ChannelDeleteMutationOutput> {- await nodeService.deleteNode(input.channelId, input.userId);+ await entryService.deleteEntry(input.channelId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/channels/channel-update.ts b/apps/desktop/src/main/mutations/channels/channel-update.tsindex 8806aa7b..80500e74 100644--- a/apps/desktop/src/main/mutations/channels/channel-update.ts+++ b/apps/desktop/src/main/mutations/channels/channel-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class ChannelUpdateMutationHandlerasync handleMutation(input: ChannelUpdateMutationInput): Promise<ChannelUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.channelId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/chats/chat-create.ts b/apps/desktop/src/main/mutations/chats/chat-create.tsindex ff9f11a7..8a8df082 100644--- a/apps/desktop/src/main/mutations/chats/chat-create.ts+++ b/apps/desktop/src/main/mutations/chats/chat-create.ts@@ -1,8 +1,8 @@-import { ChatAttributes, generateId, IdType, NodeTypes } from '@colanode/core';+import { ChatAttributes, generateId, IdType } from '@colanode/core';import { sql } from 'kysely';import { databaseService } from '@/main/data/database-service';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {ChatCreateMutationInput,@@ -25,8 +25,8 @@ export class ChatCreateMutationHandlerconst query = sql<ChatRow>`SELECT id- FROM nodes- WHERE type = ${NodeTypes.Chat}+ FROM entries+ WHERE type = 'chat'AND json_extract(attributes, '$.collaborators.${sql.raw(input.userId)}') is not nullAND json_extract(attributes, '$.collaborators.${sql.raw(input.otherUserId)}') is not null`.compile(workspaceDatabase);@@ -49,7 +49,7 @@ export class ChatCreateMutationHandler},};- await nodeService.createNode(input.userId, { id, attributes });+ await entryService.createEntry(input.userId, { id, attributes });return {id,diff --git a/apps/desktop/src/main/mutations/collaborators/node-collaborator-create.ts b/apps/desktop/src/main/mutations/collaborators/entry-collaborator-create.tssimilarity index 60%rename from apps/desktop/src/main/mutations/collaborators/node-collaborator-create.tsrename to apps/desktop/src/main/mutations/collaborators/entry-collaborator-create.tsindex ec2f40da..6bd3334c 100644--- a/apps/desktop/src/main/mutations/collaborators/node-collaborator-create.ts+++ b/apps/desktop/src/main/mutations/collaborators/entry-collaborator-create.ts@@ -1,21 +1,21 @@import { set } from 'lodash-es';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {- NodeCollaboratorCreateMutationInput,- NodeCollaboratorCreateMutationOutput,-} from '@/shared/mutations/collaborators/node-collaborator-create';+ EntryCollaboratorCreateMutationInput,+ EntryCollaboratorCreateMutationOutput,+} from '@/shared/mutations/collaborators/entry-collaborator-create';import { MutationError } from '@/shared/mutations';-export class NodeCollaboratorCreateMutationHandler- implements MutationHandler<NodeCollaboratorCreateMutationInput>+export class EntryCollaboratorCreateMutationHandler+ implements MutationHandler<EntryCollaboratorCreateMutationInput>{async handleMutation(- input: NodeCollaboratorCreateMutationInput- ): Promise<NodeCollaboratorCreateMutationOutput> {- const result = await nodeService.updateNode(- input.nodeId,+ input: EntryCollaboratorCreateMutationInput+ ): Promise<EntryCollaboratorCreateMutationOutput> {+ const result = await entryService.updateEntry(+ input.entryId,input.userId,(attributes) => {for (const collaboratorId of input.collaboratorIds) {@@ -28,14 +28,14 @@ export class NodeCollaboratorCreateMutationHandlerif (result === 'unauthorized') {throw new MutationError('unauthorized',- "You don't have permission to add collaborators to this node."+ "You don't have permission to add collaborators to this entry.");}if (result !== 'success') {throw new MutationError('unknown',- 'Something went wrong while adding collaborators to the node.'+ 'Something went wrong while adding collaborators to the entry.');}diff --git a/apps/desktop/src/main/mutations/collaborators/node-collaborator-delete.ts b/apps/desktop/src/main/mutations/collaborators/entry-collaborator-delete.tssimilarity index 59%rename from apps/desktop/src/main/mutations/collaborators/node-collaborator-delete.tsrename to apps/desktop/src/main/mutations/collaborators/entry-collaborator-delete.tsindex de0522e3..d48c855a 100644--- a/apps/desktop/src/main/mutations/collaborators/node-collaborator-delete.ts+++ b/apps/desktop/src/main/mutations/collaborators/entry-collaborator-delete.ts@@ -1,21 +1,21 @@import { unset } from 'lodash-es';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {- NodeCollaboratorDeleteMutationInput,- NodeCollaboratorDeleteMutationOutput,-} from '@/shared/mutations/collaborators/node-collaborator-delete';+ EntryCollaboratorDeleteMutationInput,+ EntryCollaboratorDeleteMutationOutput,+} from '@/shared/mutations/collaborators/entry-collaborator-delete';import { MutationError } from '@/shared/mutations';-export class NodeCollaboratorDeleteMutationHandler- implements MutationHandler<NodeCollaboratorDeleteMutationInput>+export class EntryCollaboratorDeleteMutationHandler+ implements MutationHandler<EntryCollaboratorDeleteMutationInput>{async handleMutation(- input: NodeCollaboratorDeleteMutationInput- ): Promise<NodeCollaboratorDeleteMutationOutput> {- const result = await nodeService.updateNode(- input.nodeId,+ input: EntryCollaboratorDeleteMutationInput+ ): Promise<EntryCollaboratorDeleteMutationOutput> {+ const result = await entryService.updateEntry(+ input.entryId,input.userId,(attributes) => {unset(attributes, `collaborators.${input.collaboratorId}`);diff --git a/apps/desktop/src/main/mutations/collaborators/node-collaborator-update.ts b/apps/desktop/src/main/mutations/collaborators/entry-collaborator-update.tssimilarity index 57%rename from apps/desktop/src/main/mutations/collaborators/node-collaborator-update.tsrename to apps/desktop/src/main/mutations/collaborators/entry-collaborator-update.tsindex 91addc89..56c97a56 100644--- a/apps/desktop/src/main/mutations/collaborators/node-collaborator-update.ts+++ b/apps/desktop/src/main/mutations/collaborators/entry-collaborator-update.ts@@ -1,21 +1,21 @@import { set } from 'lodash-es';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {- NodeCollaboratorUpdateMutationInput,- NodeCollaboratorUpdateMutationOutput,-} from '@/shared/mutations/collaborators/node-collaborator-update';+ EntryCollaboratorUpdateMutationInput,+ EntryCollaboratorUpdateMutationOutput,+} from '@/shared/mutations/collaborators/entry-collaborator-update';import { MutationError } from '@/shared/mutations';-export class NodeCollaboratorUpdateMutationHandler- implements MutationHandler<NodeCollaboratorUpdateMutationInput>+export class EntryCollaboratorUpdateMutationHandler+ implements MutationHandler<EntryCollaboratorUpdateMutationInput>{async handleMutation(- input: NodeCollaboratorUpdateMutationInput- ): Promise<NodeCollaboratorUpdateMutationOutput> {- const result = await nodeService.updateNode(- input.nodeId,+ input: EntryCollaboratorUpdateMutationInput+ ): Promise<EntryCollaboratorUpdateMutationOutput> {+ const result = await entryService.updateEntry(+ input.entryId,input.userId,(attributes) => {set(attributes, `collaborators.${input.collaboratorId}`, input.role);@@ -26,14 +26,14 @@ export class NodeCollaboratorUpdateMutationHandlerif (result === 'unauthorized') {throw new MutationError('unauthorized',- "You don't have permission to update collaborators for this node."+ "You don't have permission to update collaborators for this entry.");}if (result !== 'success') {throw new MutationError('unknown',- 'Something went wrong while updating collaborators for the node.'+ 'Something went wrong while updating collaborators for the entry.');}diff --git a/apps/desktop/src/main/mutations/databases/database-create.ts b/apps/desktop/src/main/mutations/databases/database-create.tsindex b7c45a5c..04cfe422 100644--- a/apps/desktop/src/main/mutations/databases/database-create.ts+++ b/apps/desktop/src/main/mutations/databases/database-create.ts@@ -5,7 +5,7 @@ import {IdType,} from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {DatabaseCreateMutationInput,@@ -50,7 +50,7 @@ export class DatabaseCreateMutationHandler},};- await nodeService.createNode(input.userId, {+ await entryService.createEntry(input.userId, {id: databaseId,attributes,});diff --git a/apps/desktop/src/main/mutations/databases/database-delete.ts b/apps/desktop/src/main/mutations/databases/database-delete.tsindex 545dc142..855a8cf1 100644--- a/apps/desktop/src/main/mutations/databases/database-delete.ts+++ b/apps/desktop/src/main/mutations/databases/database-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {DatabaseDeleteMutationInput,@@ -11,7 +11,7 @@ export class DatabaseDeleteMutationHandlerasync handleMutation(input: DatabaseDeleteMutationInput): Promise<DatabaseDeleteMutationOutput> {- await nodeService.deleteNode(input.databaseId, input.userId);+ await entryService.deleteEntry(input.databaseId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/databases/database-update.ts b/apps/desktop/src/main/mutations/databases/database-update.tsindex 65ddb46e..9fd99f67 100644--- a/apps/desktop/src/main/mutations/databases/database-update.ts+++ b/apps/desktop/src/main/mutations/databases/database-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class DatabaseUpdateMutationHandlerasync handleMutation(input: DatabaseUpdateMutationInput): Promise<DatabaseUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/field-create.ts b/apps/desktop/src/main/mutations/databases/field-create.tsindex 8ae5b18e..84e6aca2 100644--- a/apps/desktop/src/main/mutations/databases/field-create.ts+++ b/apps/desktop/src/main/mutations/databases/field-create.ts@@ -7,7 +7,7 @@ import {IdType,} from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {FieldCreateMutationInput,@@ -29,7 +29,7 @@ export class FieldCreateMutationHandler);}- const relationDatabase = await nodeService.fetchNode(+ const relationDatabase = await entryService.fetchEntry(input.relationDatabaseId,input.userId);@@ -43,7 +43,7 @@ export class FieldCreateMutationHandler}const fieldId = generateId(IdType.Field);- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/field-delete.ts b/apps/desktop/src/main/mutations/databases/field-delete.tsindex df1ed2a0..a397ec29 100644--- a/apps/desktop/src/main/mutations/databases/field-delete.ts+++ b/apps/desktop/src/main/mutations/databases/field-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class FieldDeleteMutationHandlerasync handleMutation(input: FieldDeleteMutationInput): Promise<FieldDeleteMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/field-name-update.ts b/apps/desktop/src/main/mutations/databases/field-name-update.tsindex efc56108..e20f544c 100644--- a/apps/desktop/src/main/mutations/databases/field-name-update.ts+++ b/apps/desktop/src/main/mutations/databases/field-name-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class FieldNameUpdateMutationHandlerasync handleMutation(input: FieldNameUpdateMutationInput): Promise<FieldNameUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/select-option-create.ts b/apps/desktop/src/main/mutations/databases/select-option-create.tsindex bade3395..e955983b 100644--- a/apps/desktop/src/main/mutations/databases/select-option-create.ts+++ b/apps/desktop/src/main/mutations/databases/select-option-create.ts@@ -5,7 +5,7 @@ import {IdType,} from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {SelectOptionCreateMutationInput,@@ -20,7 +20,7 @@ export class SelectOptionCreateMutationHandlerinput: SelectOptionCreateMutationInput): Promise<SelectOptionCreateMutationOutput> {const id = generateId(IdType.SelectOption);- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/select-option-delete.ts b/apps/desktop/src/main/mutations/databases/select-option-delete.tsindex 6a063ff9..ee799fdb 100644--- a/apps/desktop/src/main/mutations/databases/select-option-delete.ts+++ b/apps/desktop/src/main/mutations/databases/select-option-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class SelectOptionDeleteMutationHandlerasync handleMutation(input: SelectOptionDeleteMutationInput): Promise<SelectOptionDeleteMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/select-option-update.ts b/apps/desktop/src/main/mutations/databases/select-option-update.tsindex 34fb11a1..4c42fe1b 100644--- a/apps/desktop/src/main/mutations/databases/select-option-update.ts+++ b/apps/desktop/src/main/mutations/databases/select-option-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class SelectOptionUpdateMutationHandlerasync handleMutation(input: SelectOptionUpdateMutationInput): Promise<SelectOptionUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/view-create.ts b/apps/desktop/src/main/mutations/databases/view-create.tsindex 896ab255..42758dc2 100644--- a/apps/desktop/src/main/mutations/databases/view-create.ts+++ b/apps/desktop/src/main/mutations/databases/view-create.ts@@ -5,7 +5,7 @@ import {IdType,} from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {ViewCreateMutationInput,@@ -20,7 +20,7 @@ export class ViewCreateMutationHandlerinput: ViewCreateMutationInput): Promise<ViewCreateMutationOutput> {const id = generateId(IdType.View);- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/view-delete.ts b/apps/desktop/src/main/mutations/databases/view-delete.tsindex 883dd8fa..50699907 100644--- a/apps/desktop/src/main/mutations/databases/view-delete.ts+++ b/apps/desktop/src/main/mutations/databases/view-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class ViewDeleteMutationHandlerasync handleMutation(input: ViewDeleteMutationInput): Promise<ViewDeleteMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/view-name-update.ts b/apps/desktop/src/main/mutations/databases/view-name-update.tsindex b87e3cc0..f33f9381 100644--- a/apps/desktop/src/main/mutations/databases/view-name-update.ts+++ b/apps/desktop/src/main/mutations/databases/view-name-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class ViewNameUpdateMutationHandlerasync handleMutation(input: ViewNameUpdateMutationInput): Promise<ViewNameUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/databases/view-update.ts b/apps/desktop/src/main/mutations/databases/view-update.tsindex 2f7ec4fc..06457034 100644--- a/apps/desktop/src/main/mutations/databases/view-update.ts+++ b/apps/desktop/src/main/mutations/databases/view-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class ViewUpdateMutationHandlerasync handleMutation(input: ViewUpdateMutationInput): Promise<ViewUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.databaseId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/files/file-create.ts b/apps/desktop/src/main/mutations/files/file-create.tsindex 4411b11d..fc4e62ea 100644--- a/apps/desktop/src/main/mutations/files/file-create.ts+++ b/apps/desktop/src/main/mutations/files/file-create.ts@@ -47,6 +47,7 @@ export class FileCreateMutationHandlerid: fileId,type: metadata.type,parentId: input.parentId,+ entryId: input.entryId,rootId: input.rootId,name: metadata.name,originalName: metadata.name,@@ -66,6 +67,7 @@ export class FileCreateMutationHandlerid: fileId,type: metadata.type,parent_id: input.parentId,+ entry_id: input.entryId,root_id: input.rootId,name: metadata.name,original_name: metadata.name,diff --git a/apps/desktop/src/main/mutations/files/file-delete.ts b/apps/desktop/src/main/mutations/files/file-delete.tsindex f8aea54e..815eb21a 100644--- a/apps/desktop/src/main/mutations/files/file-delete.ts+++ b/apps/desktop/src/main/mutations/files/file-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {FileDeleteMutationInput,@@ -11,7 +11,7 @@ export class FileDeleteMutationHandlerasync handleMutation(input: FileDeleteMutationInput): Promise<FileDeleteMutationOutput> {- await nodeService.deleteNode(input.fileId, input.userId);+ await entryService.deleteEntry(input.fileId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/folders/folder-create.ts b/apps/desktop/src/main/mutations/folders/folder-create.tsindex b060e8e0..71175e80 100644--- a/apps/desktop/src/main/mutations/folders/folder-create.ts+++ b/apps/desktop/src/main/mutations/folders/folder-create.ts@@ -1,6 +1,6 @@import { FolderAttributes, generateId, IdType } from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {FolderCreateMutationInput,@@ -22,7 +22,7 @@ export class FolderCreateMutationHandlercollaborators: {},};- await nodeService.createNode(input.userId, { id, attributes });+ await entryService.createEntry(input.userId, { id, attributes });return {id: id,diff --git a/apps/desktop/src/main/mutations/folders/folder-delete.ts b/apps/desktop/src/main/mutations/folders/folder-delete.tsindex 55956958..830629f9 100644--- a/apps/desktop/src/main/mutations/folders/folder-delete.ts+++ b/apps/desktop/src/main/mutations/folders/folder-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {FolderDeleteMutationInput,@@ -11,7 +11,7 @@ export class FolderDeleteMutationHandlerasync handleMutation(input: FolderDeleteMutationInput): Promise<FolderDeleteMutationOutput> {- await nodeService.deleteNode(input.folderId, input.userId);+ await entryService.deleteEntry(input.folderId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/folders/folder-update.ts b/apps/desktop/src/main/mutations/folders/folder-update.tsindex dba63675..3d871ea3 100644--- a/apps/desktop/src/main/mutations/folders/folder-update.ts+++ b/apps/desktop/src/main/mutations/folders/folder-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class FolderUpdateMutationHandlerasync handleMutation(input: FolderUpdateMutationInput): Promise<FolderUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.folderId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/index.ts b/apps/desktop/src/main/mutations/index.tsindex 29a67b20..1870b679 100644--- a/apps/desktop/src/main/mutations/index.ts+++ b/apps/desktop/src/main/mutations/index.ts@@ -21,13 +21,11 @@ import { FileDownloadMutationHandler } from '@/main/mutations/files/file-downloaimport { FolderCreateMutationHandler } from '@/main/mutations/folders/folder-create';import { FolderUpdateMutationHandler } from '@/main/mutations/folders/folder-update';import { FolderDeleteMutationHandler } from '@/main/mutations/folders/folder-delete';-import { MarkNodeAsSeenMutationHandler } from '@/main/mutations/interactions/mark-node-as-seen';-import { MarkNodeAsOpenedMutationHandler } from '@/main/mutations/interactions/mark-node-as-opened';import { MessageCreateMutationHandler } from '@/main/mutations/messages/message-create';import { MessageDeleteMutationHandler } from '@/main/mutations/messages/message-delete';-import { NodeCollaboratorCreateMutationHandler } from '@/main/mutations/collaborators/node-collaborator-create';-import { NodeCollaboratorDeleteMutationHandler } from '@/main/mutations/collaborators/node-collaborator-delete';-import { NodeCollaboratorUpdateMutationHandler } from '@/main/mutations/collaborators/node-collaborator-update';+import { EntryCollaboratorCreateMutationHandler } from '@/main/mutations/collaborators/entry-collaborator-create';+import { EntryCollaboratorDeleteMutationHandler } from '@/main/mutations/collaborators/entry-collaborator-delete';+import { EntryCollaboratorUpdateMutationHandler } from '@/main/mutations/collaborators/entry-collaborator-update';import { MessageReactionCreateMutationHandler } from '@/main/mutations/messages/message-reaction-create';import { MessageReactionDeleteMutationHandler } from '@/main/mutations/messages/message-reaction-delete';import { PageCreateMutationHandler } from '@/main/mutations/pages/page-create';@@ -76,9 +74,9 @@ export const mutationHandlerMap: MutationHandlerMap = {message_create: new MessageCreateMutationHandler(),file_delete: new FileDeleteMutationHandler(),folder_delete: new FolderDeleteMutationHandler(),- node_collaborator_create: new NodeCollaboratorCreateMutationHandler(),- node_collaborator_delete: new NodeCollaboratorDeleteMutationHandler(),- node_collaborator_update: new NodeCollaboratorUpdateMutationHandler(),+ entry_collaborator_create: new EntryCollaboratorCreateMutationHandler(),+ entry_collaborator_delete: new EntryCollaboratorDeleteMutationHandler(),+ entry_collaborator_update: new EntryCollaboratorUpdateMutationHandler(),page_create: new PageCreateMutationHandler(),page_delete: new PageDeleteMutationHandler(),page_content_update: new PageContentUpdateMutationHandler(),@@ -109,8 +107,6 @@ export const mutationHandlerMap: MutationHandlerMap = {file_download: new FileDownloadMutationHandler(),space_update: new SpaceUpdateMutationHandler(),account_update: new AccountUpdateMutationHandler(),- mark_node_as_seen: new MarkNodeAsSeenMutationHandler(),- mark_node_as_opened: new MarkNodeAsOpenedMutationHandler(),view_update: new ViewUpdateMutationHandler(),view_delete: new ViewDeleteMutationHandler(),view_name_update: new ViewNameUpdateMutationHandler(),diff --git a/apps/desktop/src/main/mutations/interactions/mark-node-as-opened.ts b/apps/desktop/src/main/mutations/interactions/mark-node-as-opened.tsdeleted file mode 100644index 7b122251..00000000--- a/apps/desktop/src/main/mutations/interactions/mark-node-as-opened.ts+++ /dev/null@@ -1,41 +0,0 @@-import { interactionService } from '@/main/services/interaction-service';-import { MutationHandler } from '@/main/types';-import {- MarkNodeAsOpenedMutationInput,- MarkNodeAsOpenedMutationOutput,-} from '@/shared/mutations/interactions/mark-node-as-opened';--export class MarkNodeAsOpenedMutationHandler- implements MutationHandler<MarkNodeAsOpenedMutationInput>-{- async handleMutation(- input: MarkNodeAsOpenedMutationInput- ): Promise<MarkNodeAsOpenedMutationOutput> {- await interactionService.setInteraction(input.userId, input.nodeId, [- {- attribute: 'firstSeenAt',- value: new Date().toISOString(),- },- {- attribute: 'lastSeenAt',- value: new Date().toISOString(),- },- {- attribute: 'lastSeenTransactionId',- value: input.transactionId,- },- {- attribute: 'lastOpenedAt',- value: new Date().toISOString(),- },- {- attribute: 'lastOpenedTransactionId',- value: input.transactionId,- },- ]);-- return {- success: true,- };- }-}diff --git a/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts b/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.tsdeleted file mode 100644index 37229912..00000000--- a/apps/desktop/src/main/mutations/interactions/mark-node-as-seen.ts+++ /dev/null@@ -1,33 +0,0 @@-import { interactionService } from '@/main/services/interaction-service';-import { MutationHandler } from '@/main/types';-import {- MarkNodeAsSeenMutationInput,- MarkNodeAsSeenMutationOutput,-} from '@/shared/mutations/interactions/mark-node-as-seen';--export class MarkNodeAsSeenMutationHandler- implements MutationHandler<MarkNodeAsSeenMutationInput>-{- async handleMutation(- input: MarkNodeAsSeenMutationInput- ): Promise<MarkNodeAsSeenMutationOutput> {- await interactionService.setInteraction(input.userId, input.nodeId, [- {- attribute: 'lastSeenAt',- value: new Date().toISOString(),- },- {- attribute: 'firstSeenAt',- value: new Date().toISOString(),- },- {- attribute: 'lastSeenTransactionId',- value: input.transactionId,- },- ]);-- return {- success: true,- };- }-}diff --git a/apps/desktop/src/main/mutations/messages/message-create.ts b/apps/desktop/src/main/mutations/messages/message-create.tsindex 2846ed0f..8c8a58f3 100644--- a/apps/desktop/src/main/mutations/messages/message-create.ts+++ b/apps/desktop/src/main/mutations/messages/message-create.ts@@ -7,7 +7,6 @@ import {generateId,IdType,MessageContent,- NodeTypes,} from '@colanode/core';import { fileService } from '@/main/services/file-service';@@ -60,7 +59,7 @@ export class MessageCreateMutationHandlerconst fileId = generateId(IdType.File);block.id = fileId;- block.type = NodeTypes.File;+ block.type = 'file';block.attrs = null;fileService.copyFileToWorkspace(@@ -75,7 +74,8 @@ export class MessageCreateMutationHandlertype: metadata.type,status: FileStatus.Pending,parent_id: messageId,- root_id: messageId,+ entry_id: input.conversationId,+ root_id: input.rootId,name: metadata.name,original_name: metadata.name,mime_type: metadata.mimeType,@@ -90,6 +90,7 @@ export class MessageCreateMutationHandlerid: fileId,type: metadata.type,parentId: messageId,+ entryId: input.conversationId,rootId: input.rootId,name: metadata.name,originalName: metadata.name,@@ -141,7 +142,7 @@ export class MessageCreateMutationHandler.values({id: messageId,type: 'standard',- node_id: input.conversationId,+ entry_id: input.conversationId,parent_id: input.conversationId,root_id: input.rootId,content: JSON.stringify(messageContent),@@ -158,7 +159,7 @@ export class MessageCreateMutationHandlerconst createMessageMutationData: CreateMessageMutationData = {id: messageId,type: 'standard',- nodeId: input.conversationId,+ entryId: input.conversationId,parentId: input.conversationId,rootId: input.rootId,content: messageContent,diff --git a/apps/desktop/src/main/mutations/messages/message-delete.ts b/apps/desktop/src/main/mutations/messages/message-delete.tsindex 13c39dda..fa27c9c0 100644--- a/apps/desktop/src/main/mutations/messages/message-delete.ts+++ b/apps/desktop/src/main/mutations/messages/message-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {MessageDeleteMutationInput,@@ -11,7 +11,7 @@ export class MessageDeleteMutationHandlerasync handleMutation(input: MessageDeleteMutationInput): Promise<MessageDeleteMutationOutput> {- await nodeService.deleteNode(input.messageId, input.userId);+ await entryService.deleteEntry(input.messageId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/pages/page-content-update.ts b/apps/desktop/src/main/mutations/pages/page-content-update.tsindex 858cdd03..29b8da35 100644--- a/apps/desktop/src/main/mutations/pages/page-content-update.ts+++ b/apps/desktop/src/main/mutations/pages/page-content-update.ts@@ -1,6 +1,6 @@import { Block } from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { mapContentsToBlocks } from '@/shared/lib/editor';import {@@ -15,7 +15,7 @@ export class PageContentUpdateMutationHandlerasync handleMutation(input: PageContentUpdateMutationInput): Promise<PageContentUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.pageId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/pages/page-create.ts b/apps/desktop/src/main/mutations/pages/page-create.tsindex 3e89fe4a..efcbaac9 100644--- a/apps/desktop/src/main/mutations/pages/page-create.ts+++ b/apps/desktop/src/main/mutations/pages/page-create.ts@@ -1,6 +1,6 @@import { generateId, IdType, PageAttributes } from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {PageCreateMutationInput,@@ -22,7 +22,7 @@ export class PageCreateMutationHandlercontent: {},};- await nodeService.createNode(input.userId, { id, attributes });+ await entryService.createEntry(input.userId, { id, attributes });return {id: id,diff --git a/apps/desktop/src/main/mutations/pages/page-delete.ts b/apps/desktop/src/main/mutations/pages/page-delete.tsindex 68fc789a..ffc6ae36 100644--- a/apps/desktop/src/main/mutations/pages/page-delete.ts+++ b/apps/desktop/src/main/mutations/pages/page-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {PageDeleteMutationInput,@@ -11,7 +11,7 @@ export class PageDeleteMutationHandlerasync handleMutation(input: PageDeleteMutationInput): Promise<PageDeleteMutationOutput> {- await nodeService.deleteNode(input.pageId, input.userId);+ await entryService.deleteEntry(input.pageId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/pages/page-update.ts b/apps/desktop/src/main/mutations/pages/page-update.tsindex 07c225cb..e2d9ff46 100644--- a/apps/desktop/src/main/mutations/pages/page-update.ts+++ b/apps/desktop/src/main/mutations/pages/page-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class PageUpdateMutationHandlerasync handleMutation(input: PageUpdateMutationInput): Promise<PageUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.pageId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/records/record-avatar-update.ts b/apps/desktop/src/main/mutations/records/record-avatar-update.tsindex 35853df6..f5fcd1cd 100644--- a/apps/desktop/src/main/mutations/records/record-avatar-update.ts+++ b/apps/desktop/src/main/mutations/records/record-avatar-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class RecordAvatarUpdateMutationHandlerasync handleMutation(input: RecordAvatarUpdateMutationInput): Promise<RecordAvatarUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.recordId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/records/record-content-update.ts b/apps/desktop/src/main/mutations/records/record-content-update.tsindex cc1b098e..a1fe123e 100644--- a/apps/desktop/src/main/mutations/records/record-content-update.ts+++ b/apps/desktop/src/main/mutations/records/record-content-update.ts@@ -1,6 +1,6 @@import { Block } from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { mapContentsToBlocks } from '@/shared/lib/editor';import {@@ -15,7 +15,7 @@ export class RecordContentUpdateMutationHandlerasync handleMutation(input: RecordContentUpdateMutationInput): Promise<RecordContentUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.recordId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/records/record-create.ts b/apps/desktop/src/main/mutations/records/record-create.tsindex e3a2e4c5..b7288f0e 100644--- a/apps/desktop/src/main/mutations/records/record-create.ts+++ b/apps/desktop/src/main/mutations/records/record-create.ts@@ -1,6 +1,6 @@import { generateId, IdType, RecordAttributes } from '@colanode/core';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {RecordCreateMutationInput,@@ -23,7 +23,7 @@ export class RecordCreateMutationHandlercontent: {},};- await nodeService.createNode(input.userId, { id, attributes });+ await entryService.createEntry(input.userId, { id, attributes });return {id: id,diff --git a/apps/desktop/src/main/mutations/records/record-delete.ts b/apps/desktop/src/main/mutations/records/record-delete.tsindex 4a55667b..cca0f38e 100644--- a/apps/desktop/src/main/mutations/records/record-delete.ts+++ b/apps/desktop/src/main/mutations/records/record-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {RecordDeleteMutationInput,@@ -11,7 +11,7 @@ export class RecordDeleteMutationHandlerasync handleMutation(input: RecordDeleteMutationInput): Promise<RecordDeleteMutationOutput> {- await nodeService.deleteNode(input.recordId, input.userId);+ await entryService.deleteEntry(input.recordId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/records/record-field-value-delete.ts b/apps/desktop/src/main/mutations/records/record-field-value-delete.tsindex 50fd7826..e3f1a734 100644--- a/apps/desktop/src/main/mutations/records/record-field-value-delete.ts+++ b/apps/desktop/src/main/mutations/records/record-field-value-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class RecordFieldValueDeleteMutationHandlerasync handleMutation(input: RecordFieldValueDeleteMutationInput): Promise<RecordFieldValueDeleteMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.recordId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/records/record-field-value-set.ts b/apps/desktop/src/main/mutations/records/record-field-value-set.tsindex 91be3f83..21764ad4 100644--- a/apps/desktop/src/main/mutations/records/record-field-value-set.ts+++ b/apps/desktop/src/main/mutations/records/record-field-value-set.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class RecordFieldValueSetMutationHandlerasync handleMutation(input: RecordFieldValueSetMutationInput): Promise<RecordFieldValueSetMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.recordId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/records/record-name-update.ts b/apps/desktop/src/main/mutations/records/record-name-update.tsindex 0e7b4c4a..8f33499a 100644--- a/apps/desktop/src/main/mutations/records/record-name-update.ts+++ b/apps/desktop/src/main/mutations/records/record-name-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,7 +12,7 @@ export class RecordNameUpdateMutationHandlerasync handleMutation(input: RecordNameUpdateMutationInput): Promise<RecordNameUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.recordId,input.userId,(attributes) => {diff --git a/apps/desktop/src/main/mutations/spaces/space-create.ts b/apps/desktop/src/main/mutations/spaces/space-create.tsindex c5b1e40e..dd5631b8 100644--- a/apps/desktop/src/main/mutations/spaces/space-create.ts+++ b/apps/desktop/src/main/mutations/spaces/space-create.ts@@ -7,7 +7,7 @@ import {} from '@colanode/core';import { databaseService } from '@/main/data/database-service';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {SpaceCreateMutationInput,@@ -66,7 +66,7 @@ export class SpaceCreateMutationHandlerparentId: spaceId,};- await nodeService.createNode(input.userId, [+ await entryService.createEntry(input.userId, [{id: spaceId,attributes: spaceAttributes,diff --git a/apps/desktop/src/main/mutations/spaces/space-delete.ts b/apps/desktop/src/main/mutations/spaces/space-delete.tsindex 626b1297..fe473948 100644--- a/apps/desktop/src/main/mutations/spaces/space-delete.ts+++ b/apps/desktop/src/main/mutations/spaces/space-delete.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import {SpaceDeleteMutationInput,@@ -11,7 +11,7 @@ export class SpaceDeleteMutationHandlerasync handleMutation(input: SpaceDeleteMutationInput): Promise<SpaceDeleteMutationOutput> {- await nodeService.deleteNode(input.spaceId, input.userId);+ await entryService.deleteEntry(input.spaceId, input.userId);return {success: true,diff --git a/apps/desktop/src/main/mutations/spaces/space-update.ts b/apps/desktop/src/main/mutations/spaces/space-update.tsindex 226754e3..2d622f22 100644--- a/apps/desktop/src/main/mutations/spaces/space-update.ts+++ b/apps/desktop/src/main/mutations/spaces/space-update.ts@@ -1,4 +1,4 @@-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';import { MutationHandler } from '@/main/types';import { MutationError } from '@/shared/mutations';import {@@ -12,12 +12,12 @@ export class SpaceUpdateMutationHandlerasync handleMutation(input: SpaceUpdateMutationInput): Promise<SpaceUpdateMutationOutput> {- const result = await nodeService.updateNode(+ const result = await entryService.updateEntry(input.id,input.userId,(attributes) => {if (attributes.type !== 'space') {- throw new MutationError('invalid_attributes', 'Node is not a space');+ throw new MutationError('invalid_attributes', 'Entry is not a space');}attributes.name = input.name;diff --git a/apps/desktop/src/main/queries/databases/database-list.ts b/apps/desktop/src/main/queries/databases/database-list.tsindex 8349f91e..facba53d 100644--- a/apps/desktop/src/main/queries/databases/database-list.ts+++ b/apps/desktop/src/main/queries/databases/database-list.ts@@ -1,9 +1,9 @@-import { compareString, DatabaseNode } from '@colanode/core';+import { compareString, DatabaseEntry } from '@colanode/core';import { databaseService } from '@/main/data/database-service';-import { SelectNode } from '@/main/data/workspace/schema';+import { SelectEntry } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { mapNode } from '@/main/utils';+import { mapEntry } from '@/main/utils';import { DatabaseListQueryInput } from '@/shared/queries/databases/database-list';import { Event } from '@/shared/types/events';@@ -12,7 +12,7 @@ export class DatabaseListQueryHandler{public async handleQuery(input: DatabaseListQueryInput- ): Promise<DatabaseNode[]> {+ ): Promise<DatabaseEntry[]> {const databases = await this.fetchDatabases(input);return this.buildDatabases(databases);}@@ -20,7 +20,7 @@ export class DatabaseListQueryHandlerpublic async checkForChanges(event: Event,input: DatabaseListQueryInput,- output: DatabaseNode[]+ output: DatabaseEntry[]): Promise<ChangeCheckResult<DatabaseListQueryInput>> {if (event.type === 'workspace_deleted' &&@@ -33,9 +33,9 @@ export class DatabaseListQueryHandler}if (- event.type === 'node_created' &&+ event.type === 'entry_created' &&event.userId === input.userId &&- event.node.type === 'database'+ event.entry.type === 'database') {const newResult = await this.handleQuery(input);@@ -46,15 +46,17 @@ export class DatabaseListQueryHandler}if (- event.type === 'node_updated' &&+ event.type === 'entry_updated' &&event.userId === input.userId &&- event.node.type === 'database'+ event.entry.type === 'database') {- const database = output.find((database) => database.id === event.node.id);+ const database = output.find(+ (database) => database.id === event.entry.id+ );if (database) {const newResult = output.map((database) => {- if (database.id === event.node.id) {- return event.node as DatabaseNode;+ if (database.id === event.entry.id) {+ return event.entry as DatabaseEntry;}return database;});@@ -67,11 +69,13 @@ export class DatabaseListQueryHandler}if (- event.type === 'node_deleted' &&+ event.type === 'entry_deleted' &&event.userId === input.userId &&- event.node.type === 'database'+ event.entry.type === 'database') {- const database = output.find((database) => database.id === event.node.id);+ const database = output.find(+ (database) => database.id === event.entry.id+ );if (database) {const newOutput = await this.handleQuery(input);@@ -89,13 +93,13 @@ export class DatabaseListQueryHandlerprivate async fetchDatabases(input: DatabaseListQueryInput- ): Promise<SelectNode[]> {+ ): Promise<SelectEntry[]> {const workspaceDatabase = await databaseService.getWorkspaceDatabase(input.userId);const databases = await workspaceDatabase- .selectFrom('nodes')+ .selectFrom('entries').where('type', '=', 'database').selectAll().execute();@@ -103,18 +107,18 @@ export class DatabaseListQueryHandlerreturn databases;}- private buildDatabases = (rows: SelectNode[]): DatabaseNode[] => {- const nodes = rows.map(mapNode);- const databaseNodes: DatabaseNode[] = [];+ private buildDatabases = (rows: SelectEntry[]): DatabaseEntry[] => {+ const entries = rows.map(mapEntry);+ const databaseEntries: DatabaseEntry[] = [];- for (const node of nodes) {- if (node.type !== 'database') {+ for (const entry of entries) {+ if (entry.type !== 'database') {continue;}- databaseNodes.push(node);+ databaseEntries.push(entry);}- return databaseNodes.sort((a, b) => compareString(a.id, b.id));+ return databaseEntries.sort((a, b) => compareString(a.id, b.id));};}diff --git a/apps/desktop/src/main/queries/entries/entry-children-get.ts b/apps/desktop/src/main/queries/entries/entry-children-get.tsnew file mode 100644index 00000000..796fc4a1--- /dev/null+++ b/apps/desktop/src/main/queries/entries/entry-children-get.ts@@ -0,0 +1,106 @@+import { Entry } from '@colanode/core';++import { databaseService } from '@/main/data/database-service';+import { SelectEntry } from '@/main/data/workspace/schema';+import { ChangeCheckResult, QueryHandler } from '@/main/types';+import { mapEntry } from '@/main/utils';+import { EntryChildrenGetQueryInput } from '@/shared/queries/entries/entry-children-get';+import { Event } from '@/shared/types/events';++export class EntryChildrenGetQueryHandler+ implements QueryHandler<EntryChildrenGetQueryInput>+{+ public async handleQuery(+ input: EntryChildrenGetQueryInput+ ): Promise<Entry[]> {+ const rows = await this.fetchChildren(input);+ return rows.map(mapEntry);+ }++ public async checkForChanges(+ event: Event,+ input: EntryChildrenGetQueryInput,+ output: Entry[]+ ): Promise<ChangeCheckResult<EntryChildrenGetQueryInput>> {+ if (+ event.type === 'workspace_deleted' &&+ event.workspace.userId === input.userId+ ) {+ return {+ hasChanges: true,+ result: [],+ };+ }++ if (+ event.type === 'entry_created' &&+ event.userId === input.userId &&+ event.entry.parentId === input.entryId &&+ (input.types === undefined || input.types.includes(event.entry.type))+ ) {+ const newChildren = [...output, event.entry];+ return {+ hasChanges: true,+ result: newChildren,+ };+ }++ if (+ event.type === 'entry_updated' &&+ event.userId === input.userId &&+ event.entry.parentId === input.entryId &&+ (input.types === undefined || input.types.includes(event.entry.type))+ ) {+ const entry = output.find((entry) => entry.id === event.entry.id);+ if (entry) {+ const newChildren = output.map((entry) =>+ entry.id === event.entry.id ? event.entry : entry+ );++ return {+ hasChanges: true,+ result: newChildren,+ };+ }+ }++ if (+ event.type === 'entry_deleted' &&+ event.userId === input.userId &&+ event.entry.parentId === input.entryId &&+ (input.types === undefined || input.types.includes(event.entry.type))+ ) {+ const entry = output.find((entry) => entry.id === event.entry.id);+ if (entry) {+ const newChildren = output.filter(+ (entry) => entry.id !== event.entry.id+ );+ return {+ hasChanges: true,+ result: newChildren,+ };+ }+ }++ return {+ hasChanges: false,+ };+ }++ private async fetchChildren(+ input: EntryChildrenGetQueryInput+ ): Promise<SelectEntry[]> {+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(+ input.userId+ );++ const rows = await workspaceDatabase+ .selectFrom('entries')+ .selectAll()+ .where('parent_id', '=', input.entryId)+ .where('type', 'in', input.types ?? [])+ .execute();++ return rows;+ }+}diff --git a/apps/desktop/src/main/queries/nodes/node-get.ts b/apps/desktop/src/main/queries/entries/entry-get.tssimilarity index 50%rename from apps/desktop/src/main/queries/nodes/node-get.tsrename to apps/desktop/src/main/queries/entries/entry-get.tsindex fa5c6a59..57fbd653 100644--- a/apps/desktop/src/main/queries/nodes/node-get.ts+++ b/apps/desktop/src/main/queries/entries/entry-get.ts@@ -1,23 +1,23 @@-import { Node } from '@colanode/core';+import { Entry } from '@colanode/core';import { databaseService } from '@/main/data/database-service';-import { SelectNode } from '@/main/data/workspace/schema';+import { SelectEntry } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { mapNode } from '@/main/utils';-import { NodeGetQueryInput } from '@/shared/queries/nodes/node-get';+import { mapEntry } from '@/main/utils';+import { EntryGetQueryInput } from '@/shared/queries/entries/entry-get';import { Event } from '@/shared/types/events';-export class NodeGetQueryHandler implements QueryHandler<NodeGetQueryInput> {- public async handleQuery(input: NodeGetQueryInput): Promise<Node | null> {- const row = await this.fetchNode(input);- return row ? mapNode(row) : null;+export class EntryGetQueryHandler implements QueryHandler<EntryGetQueryInput> {+ public async handleQuery(input: EntryGetQueryInput): Promise<Entry | null> {+ const row = await this.fetchEntry(input);+ return row ? mapEntry(row) : null;}public async checkForChanges(event: Event,- input: NodeGetQueryInput,- _: Node | null- ): Promise<ChangeCheckResult<NodeGetQueryInput>> {+ input: EntryGetQueryInput,+ _: Entry | null+ ): Promise<ChangeCheckResult<EntryGetQueryInput>> {if (event.type === 'workspace_deleted' &&event.workspace.userId === input.userId@@ -29,31 +29,31 @@ export class NodeGetQueryHandler implements QueryHandler<NodeGetQueryInput> {}if (- event.type === 'node_created' &&+ event.type === 'entry_created' &&event.userId === input.userId &&- event.node.id === input.nodeId+ event.entry.id === input.entryId) {return {hasChanges: true,- result: event.node,+ result: event.entry,};}if (- event.type === 'node_updated' &&+ event.type === 'entry_updated' &&event.userId === input.userId &&- event.node.id === input.nodeId+ event.entry.id === input.entryId) {return {hasChanges: true,- result: event.node,+ result: event.entry,};}if (- event.type === 'node_deleted' &&+ event.type === 'entry_deleted' &&event.userId === input.userId &&- event.node.id === input.nodeId+ event.entry.id === input.entryId) {return {hasChanges: true,@@ -66,17 +66,17 @@ export class NodeGetQueryHandler implements QueryHandler<NodeGetQueryInput> {};}- private async fetchNode(- input: NodeGetQueryInput- ): Promise<SelectNode | undefined> {+ private async fetchEntry(+ input: EntryGetQueryInput+ ): Promise<SelectEntry | undefined> {const workspaceDatabase = await databaseService.getWorkspaceDatabase(input.userId);const row = await workspaceDatabase- .selectFrom('nodes')+ .selectFrom('entries').selectAll()- .where('id', '=', input.nodeId)+ .where('id', '=', input.entryId).executeTakeFirst();return row;diff --git a/apps/desktop/src/main/queries/entries/entry-tree-get.ts b/apps/desktop/src/main/queries/entries/entry-tree-get.tsnew file mode 100644index 00000000..76631f24--- /dev/null+++ b/apps/desktop/src/main/queries/entries/entry-tree-get.ts@@ -0,0 +1,108 @@+import { Entry } from '@colanode/core';++import { databaseService } from '@/main/data/database-service';+import { SelectEntry } from '@/main/data/workspace/schema';+import { ChangeCheckResult, QueryHandler } from '@/main/types';+import { fetchEntryAncestors, mapEntry } from '@/main/utils';+import { EntryTreeGetQueryInput } from '@/shared/queries/entries/entry-tree-get';+import { Event } from '@/shared/types/events';++export class EntryTreeGetQueryHandler+ implements QueryHandler<EntryTreeGetQueryInput>+{+ public async handleQuery(input: EntryTreeGetQueryInput): Promise<Entry[]> {+ const rows = await this.fetchEntries(input);+ return rows.map(mapEntry);+ }++ public async checkForChanges(+ event: Event,+ input: EntryTreeGetQueryInput,+ output: Entry[]+ ): Promise<ChangeCheckResult<EntryTreeGetQueryInput>> {+ if (+ event.type === 'workspace_deleted' &&+ event.workspace.userId === input.userId+ ) {+ return {+ hasChanges: true,+ result: [],+ };+ }++ if (+ event.type === 'entry_created' &&+ event.userId === input.userId &&+ event.entry.id === input.entryId+ ) {+ const newResult = await this.handleQuery(input);+ return {+ hasChanges: true,+ result: newResult,+ };+ }++ if (event.type === 'entry_updated' && event.userId === input.userId) {+ const entry = output.find((entry) => entry.id === event.entry.id);+ if (entry) {+ const newEntries = output.map((entry) => {+ if (entry.id === event.entry.id) {+ return event.entry;+ }+ return entry;+ });++ return {+ hasChanges: true,+ result: newEntries,+ };+ }+ }++ if (event.type === 'entry_deleted' && event.userId === input.userId) {+ const entry = output.find((entry) => entry.id === event.entry.id);+ if (entry) {+ const newResult = await this.handleQuery(input);+ return {+ hasChanges: true,+ result: newResult,+ };+ }+ }++ return {+ hasChanges: false,+ };+ }++ private async fetchEntries(+ input: EntryTreeGetQueryInput+ ): Promise<SelectEntry[]> {+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(+ input.userId+ );++ const rows = await fetchEntryAncestors(workspaceDatabase, input.entryId);+ if (rows.length === 0) {+ return [];+ }++ const result: SelectEntry[] = [];++ let entry = rows.find((row) => row.id === input.entryId);+ if (!entry) {+ return [];+ }++ while (entry) {+ result.unshift(entry);+ entry = rows.find((row) => row.id === entry?.parent_id);++ if (!entry || entry.id === entry.parent_id) {+ break;+ }+ }++ return result;+ }+}diff --git a/apps/desktop/src/main/queries/files/file-get.ts b/apps/desktop/src/main/queries/files/file-get.tsindex f96f85f6..3d9ff0fb 100644--- a/apps/desktop/src/main/queries/files/file-get.ts+++ b/apps/desktop/src/main/queries/files/file-get.ts@@ -86,6 +86,7 @@ export class FileGetQueryHandler implements QueryHandler<FileGetQueryInput> {'f.id','f.type','f.parent_id',+ 'f.entry_id','f.root_id','f.name','f.original_name',diff --git a/apps/desktop/src/main/queries/files/file-list.ts b/apps/desktop/src/main/queries/files/file-list.tsindex d3674de0..f0d04106 100644--- a/apps/desktop/src/main/queries/files/file-list.ts+++ b/apps/desktop/src/main/queries/files/file-list.ts@@ -103,6 +103,7 @@ export class FileListQueryHandler implements QueryHandler<FileListQueryInput> {'f.type','f.parent_id','f.root_id',+ 'f.entry_id','f.name','f.original_name','f.mime_type',diff --git a/apps/desktop/src/main/queries/index.ts b/apps/desktop/src/main/queries/index.tsindex d9ae8fe2..6cea71c9 100644--- a/apps/desktop/src/main/queries/index.ts+++ b/apps/desktop/src/main/queries/index.ts@@ -7,9 +7,9 @@ import { FileMetadataGetQueryHandler } from '@/main/queries/files/file-metadata-import { IconsGetQueryHandler } from '@/main/queries/icons/icons-get';import { MessageListQueryHandler } from '@/main/queries/messages/message-list';import { MessageReactionsGetQueryHandler } from '@/main/queries/messages/message-reactions-get';-import { NodeChildrenGetQueryHandler } from '@/main/queries/nodes/node-children-get';-import { NodeGetQueryHandler } from '@/main/queries/nodes/node-get';-import { NodeTreeGetQueryHandler } from '@/main/queries/nodes/node-tree-get';+import { EntryChildrenGetQueryHandler } from '@/main/queries/entries/entry-children-get';+import { EntryGetQueryHandler } from '@/main/queries/entries/entry-get';+import { EntryTreeGetQueryHandler } from '@/main/queries/entries/entry-tree-get';import { RadarDataGetQueryHandler } from '@/main/queries/interactions/radar-data-get';import { RecordListQueryHandler } from '@/main/queries/records/record-list';import { ServerListQueryHandler } from '@/main/queries/servers/server-list';@@ -31,7 +31,7 @@ export const queryHandlerMap: QueryHandlerMap = {account_list: new AccountListQueryHandler(),message_list: new MessageListQueryHandler(),message_reactions_get: new MessageReactionsGetQueryHandler(),- node_get: new NodeGetQueryHandler(),+ entry_get: new EntryGetQueryHandler(),record_list: new RecordListQueryHandler(),server_list: new ServerListQueryHandler(),user_search: new UserSearchQueryHandler(),@@ -40,8 +40,8 @@ export const queryHandlerMap: QueryHandlerMap = {file_list: new FileListQueryHandler(),emojis_get: new EmojisGetQueryHandler(),icons_get: new IconsGetQueryHandler(),- node_tree_get: new NodeTreeGetQueryHandler(),- node_children_get: new NodeChildrenGetQueryHandler(),+ entry_tree_get: new EntryTreeGetQueryHandler(),+ entry_children_get: new EntryChildrenGetQueryHandler(),radar_data_get: new RadarDataGetQueryHandler(),file_metadata_get: new FileMetadataGetQueryHandler(),account_get: new AccountGetQueryHandler(),diff --git a/apps/desktop/src/main/queries/nodes/node-children-get.ts b/apps/desktop/src/main/queries/nodes/node-children-get.tsdeleted file mode 100644index 89bd3514..00000000--- a/apps/desktop/src/main/queries/nodes/node-children-get.ts+++ /dev/null@@ -1,102 +0,0 @@-import { Node } from '@colanode/core';--import { databaseService } from '@/main/data/database-service';-import { SelectNode } from '@/main/data/workspace/schema';-import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { mapNode } from '@/main/utils';-import { NodeChildrenGetQueryInput } from '@/shared/queries/nodes/node-children-get';-import { Event } from '@/shared/types/events';--export class NodeChildrenGetQueryHandler- implements QueryHandler<NodeChildrenGetQueryInput>-{- public async handleQuery(input: NodeChildrenGetQueryInput): Promise<Node[]> {- const rows = await this.fetchChildren(input);- return rows.map(mapNode);- }-- public async checkForChanges(- event: Event,- input: NodeChildrenGetQueryInput,- output: Node[]- ): Promise<ChangeCheckResult<NodeChildrenGetQueryInput>> {- if (- event.type === 'workspace_deleted' &&- event.workspace.userId === input.userId- ) {- return {- hasChanges: true,- result: [],- };- }-- if (- event.type === 'node_created' &&- event.userId === input.userId &&- event.node.parentId === input.nodeId &&- (input.types === undefined || input.types.includes(event.node.type))- ) {- const newChildren = [...output, event.node];- return {- hasChanges: true,- result: newChildren,- };- }-- if (- event.type === 'node_updated' &&- event.userId === input.userId &&- event.node.parentId === input.nodeId &&- (input.types === undefined || input.types.includes(event.node.type))- ) {- const node = output.find((node) => node.id === event.node.id);- if (node) {- const newChildren = output.map((node) =>- node.id === event.node.id ? event.node : node- );-- return {- hasChanges: true,- result: newChildren,- };- }- }-- if (- event.type === 'node_deleted' &&- event.userId === input.userId &&- event.node.parentId === input.nodeId &&- (input.types === undefined || input.types.includes(event.node.type))- ) {- const node = output.find((node) => node.id === event.node.id);- if (node) {- const newChildren = output.filter((node) => node.id !== event.node.id);- return {- hasChanges: true,- result: newChildren,- };- }- }-- return {- hasChanges: false,- };- }-- private async fetchChildren(- input: NodeChildrenGetQueryInput- ): Promise<SelectNode[]> {- const workspaceDatabase = await databaseService.getWorkspaceDatabase(- input.userId- );-- const rows = await workspaceDatabase- .selectFrom('nodes')- .selectAll()- .where('parent_id', '=', input.nodeId)- .where('type', 'in', input.types ?? [])- .execute();-- return rows;- }-}diff --git a/apps/desktop/src/main/queries/nodes/node-tree-get.ts b/apps/desktop/src/main/queries/nodes/node-tree-get.tsdeleted file mode 100644index 4a386464..00000000--- a/apps/desktop/src/main/queries/nodes/node-tree-get.ts+++ /dev/null@@ -1,108 +0,0 @@-import { Node } from '@colanode/core';--import { databaseService } from '@/main/data/database-service';-import { SelectNode } from '@/main/data/workspace/schema';-import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { fetchNodeAncestors, mapNode } from '@/main/utils';-import { NodeTreeGetQueryInput } from '@/shared/queries/nodes/node-tree-get';-import { Event } from '@/shared/types/events';--export class NodeTreeGetQueryHandler- implements QueryHandler<NodeTreeGetQueryInput>-{- public async handleQuery(input: NodeTreeGetQueryInput): Promise<Node[]> {- const rows = await this.fetchNodes(input);- return rows.map(mapNode);- }-- public async checkForChanges(- event: Event,- input: NodeTreeGetQueryInput,- output: Node[]- ): Promise<ChangeCheckResult<NodeTreeGetQueryInput>> {- if (- event.type === 'workspace_deleted' &&- event.workspace.userId === input.userId- ) {- return {- hasChanges: true,- result: [],- };- }-- if (- event.type === 'node_created' &&- event.userId === input.userId &&- event.node.id === input.nodeId- ) {- const newResult = await this.handleQuery(input);- return {- hasChanges: true,- result: newResult,- };- }-- if (event.type === 'node_updated' && event.userId === input.userId) {- const node = output.find((node) => node.id === event.node.id);- if (node) {- const newNodes = output.map((node) => {- if (node.id === event.node.id) {- return event.node;- }- return node;- });-- return {- hasChanges: true,- result: newNodes,- };- }- }-- if (event.type === 'node_deleted' && event.userId === input.userId) {- const node = output.find((node) => node.id === event.node.id);- if (node) {- const newResult = await this.handleQuery(input);- return {- hasChanges: true,- result: newResult,- };- }- }-- return {- hasChanges: false,- };- }-- private async fetchNodes(- input: NodeTreeGetQueryInput- ): Promise<SelectNode[]> {- const workspaceDatabase = await databaseService.getWorkspaceDatabase(- input.userId- );-- const rows = await fetchNodeAncestors(workspaceDatabase, input.nodeId);- if (rows.length === 0) {- return [];- }-- const result: SelectNode[] = [];-- let node = rows.find((row) => row.id === input.nodeId);- if (!node) {- return [];- }-- while (node) {- result.unshift(node);- node = rows.find((row) => row.id === node?.parent_id);-- if (!node || node.id === node.parent_id) {- break;- }- }-- return result;- }-}diff --git a/apps/desktop/src/main/queries/records/record-list.ts b/apps/desktop/src/main/queries/records/record-list.tsindex 8399d8d5..74f220e2 100644--- a/apps/desktop/src/main/queries/records/record-list.ts+++ b/apps/desktop/src/main/queries/records/record-list.ts@@ -1,16 +1,15 @@import {BooleanFieldAttributes,CreatedAtFieldAttributes,- DatabaseNode,+ DatabaseEntry,DateFieldAttributes,EmailFieldAttributes,FieldAttributes,isStringArray,MultiSelectFieldAttributes,- NodeTypes,NumberFieldAttributes,PhoneFieldAttributes,- RecordNode,+ RecordEntry,SelectFieldAttributes,TextFieldAttributes,UrlFieldAttributes,@@ -21,16 +20,18 @@ import {import { sql } from 'kysely';import { databaseService } from '@/main/data/database-service';-import { SelectNode } from '@/main/data/workspace/schema';+import { SelectEntry } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { mapNode } from '@/main/utils';+import { mapEntry } from '@/main/utils';import { RecordListQueryInput } from '@/shared/queries/records/record-list';import { Event } from '@/shared/types/events';export class RecordListQueryHandlerimplements QueryHandler<RecordListQueryInput>{- public async handleQuery(input: RecordListQueryInput): Promise<RecordNode[]> {+ public async handleQuery(+ input: RecordListQueryInput+ ): Promise<RecordEntry[]> {const rows = await this.fetchRecords(input);return this.buildRecords(rows);}@@ -38,7 +39,7 @@ export class RecordListQueryHandlerpublic async checkForChanges(event: Event,input: RecordListQueryInput,- output: RecordNode[]+ output: RecordEntry[]): Promise<ChangeCheckResult<RecordListQueryInput>> {if (event.type === 'workspace_deleted' &&@@ -51,9 +52,9 @@ export class RecordListQueryHandler}if (- event.type === 'node_created' &&+ event.type === 'entry_created' &&event.userId === input.userId &&- event.node.type === 'record'+ event.entry.type === 'record') {const newResult = await this.handleQuery(input);return {@@ -62,10 +63,10 @@ export class RecordListQueryHandler};}- if (event.type === 'node_updated' && event.userId === input.userId) {+ if (event.type === 'entry_updated' && event.userId === input.userId) {if (- event.node.type === 'record' &&- event.node.attributes.databaseId === input.databaseId+ event.entry.type === 'record' &&+ event.entry.attributes.databaseId === input.databaseId) {if (input.filters.length > 0 || input.sorts.length > 0) {const newResult = await this.handleQuery(input);@@ -75,11 +76,11 @@ export class RecordListQueryHandler};}- const record = output.find((record) => record.id === event.node.id);+ const record = output.find((record) => record.id === event.entry.id);if (record) {const newResult = output.map((record) => {- if (record.id === event.node.id) {- return event.node as RecordNode;+ if (record.id === event.entry.id) {+ return event.entry as RecordEntry;}return record;});@@ -92,8 +93,8 @@ export class RecordListQueryHandler}if (- event.node.type === 'database' &&- event.node.id === input.databaseId+ event.entry.type === 'database' &&+ event.entry.id === input.databaseId) {const newResult = await this.handleQuery(input);return {@@ -103,10 +104,10 @@ export class RecordListQueryHandler}}- if (event.type === 'node_deleted' && event.userId === input.userId) {+ if (event.type === 'entry_deleted' && event.userId === input.userId) {if (- event.node.type === 'record' &&- event.node.attributes.databaseId === input.databaseId+ event.entry.type === 'record' &&+ event.entry.attributes.databaseId === input.databaseId) {const newResult = await this.handleQuery(input);return {@@ -116,8 +117,8 @@ export class RecordListQueryHandler}if (- event.node.type === 'database' &&- event.node.id === input.databaseId+ event.entry.type === 'database' &&+ event.entry.id === input.databaseId) {return {hasChanges: true,@@ -133,7 +134,7 @@ export class RecordListQueryHandlerprivate async fetchRecords(input: RecordListQueryInput- ): Promise<SelectNode[]> {+ ): Promise<SelectEntry[]> {const workspaceDatabase = await databaseService.getWorkspaceDatabase(input.userId);@@ -146,10 +147,10 @@ export class RecordListQueryHandlerconst orderByQuery = `ORDER BY ${input.sorts.length > 0 ? this.buildSortOrdersQuery(input.sorts, database.attributes.fields) : 'n."id" ASC'}`;const offset = (input.page - 1) * input.count;- const query = sql<SelectNode>`- SELECT n.*- FROM nodes n- WHERE n.parent_id = ${input.databaseId} AND n.type = ${NodeTypes.Record} ${sql.raw(filterQuery)}+ const query = sql<SelectEntry>`+ SELECT e.*+ FROM entries e+ WHERE e.parent_id = ${input.databaseId} AND e.type = 'record' ${sql.raw(filterQuery)}${sql.raw(orderByQuery)}LIMIT ${sql.lit(input.count)}OFFSET ${sql.lit(offset)}@@ -159,30 +160,30 @@ export class RecordListQueryHandlerreturn result.rows;}- private buildRecords = (rows: SelectNode[]): RecordNode[] => {- const nodes = rows.map(mapNode);- const recordNodes: RecordNode[] = [];+ private buildRecords = (rows: SelectEntry[]): RecordEntry[] => {+ const entries = rows.map(mapEntry);+ const recordEntries: RecordEntry[] = [];- for (const node of nodes) {- if (node.type !== 'record') {+ for (const entry of entries) {+ if (entry.type !== 'record') {continue;}- recordNodes.push(node);+ recordEntries.push(entry);}- return recordNodes;+ return recordEntries;};private async fetchDatabase(userId: string,databaseId: string- ): Promise<DatabaseNode> {+ ): Promise<DatabaseEntry> {const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);const row = await workspaceDatabase- .selectFrom('nodes')+ .selectFrom('entries').where('id', '=', databaseId).selectAll().executeTakeFirst();@@ -191,7 +192,7 @@ export class RecordListQueryHandlerthrow new Error('Database not found');}- const database = mapNode(row) as DatabaseNode;+ const database = mapEntry(row) as DatabaseEntry;return database;}diff --git a/apps/desktop/src/main/queries/records/record-search.ts b/apps/desktop/src/main/queries/records/record-search.tsindex fe30be36..5d79831b 100644--- a/apps/desktop/src/main/queries/records/record-search.ts+++ b/apps/desktop/src/main/queries/records/record-search.ts@@ -1,10 +1,10 @@-import { NodeTypes, RecordNode } from '@colanode/core';+import { RecordEntry } from '@colanode/core';import { sql } from 'kysely';import { databaseService } from '@/main/data/database-service';-import { SelectNode } from '@/main/data/workspace/schema';+import { SelectEntry } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { mapNode } from '@/main/utils';+import { mapEntry } from '@/main/utils';import { RecordSearchQueryInput } from '@/shared/queries/records/record-search';import { Event } from '@/shared/types/events';@@ -13,19 +13,19 @@ export class RecordSearchQueryHandler{public async handleQuery(input: RecordSearchQueryInput- ): Promise<RecordNode[]> {+ ): Promise<RecordEntry[]> {const rows =input.searchQuery.length > 0? await this.searchRecords(input): await this.fetchRecords(input);- return this.buildRecordNodes(rows);+ return this.buildRecordEntries(rows);}public async checkForChanges(event: Event,input: RecordSearchQueryInput,- _: RecordNode[]+ _: RecordEntry[]): Promise<ChangeCheckResult<RecordSearchQueryInput>> {if (event.type === 'workspace_deleted' &&@@ -38,10 +38,10 @@ export class RecordSearchQueryHandler}if (- event.type === 'node_created' &&+ event.type === 'entry_created' &&event.userId === input.userId &&- event.node.type === 'record' &&- event.node.attributes.databaseId === input.databaseId+ event.entry.type === 'record' &&+ event.entry.attributes.databaseId === input.databaseId) {const newResult = await this.handleQuery(input);return {@@ -51,10 +51,10 @@ export class RecordSearchQueryHandler}if (- event.type === 'node_updated' &&+ event.type === 'entry_updated' &&event.userId === input.userId &&- event.node.type === 'record' &&- event.node.attributes.databaseId === input.databaseId+ event.entry.type === 'record' &&+ event.entry.attributes.databaseId === input.databaseId) {const newResult = await this.handleQuery(input);return {@@ -64,10 +64,10 @@ export class RecordSearchQueryHandler}if (- event.type === 'node_deleted' &&+ event.type === 'entry_deleted' &&event.userId === input.userId &&- event.node.type === 'record' &&- event.node.attributes.databaseId === input.databaseId+ event.entry.type === 'record' &&+ event.entry.attributes.databaseId === input.databaseId) {const newResult = await this.handleQuery(input);return {@@ -83,22 +83,22 @@ export class RecordSearchQueryHandlerprivate async searchRecords(input: RecordSearchQueryInput- ): Promise<SelectNode[]> {+ ): Promise<SelectEntry[]> {const workspaceDatabase = await databaseService.getWorkspaceDatabase(input.userId);const exclude = input.exclude ?? [];- const query = sql<SelectNode>`- SELECT n.*- FROM nodes n- JOIN node_names nn ON n.id = nn.id- WHERE n.type = ${NodeTypes.Record}- AND n.parent_id = ${input.databaseId}- AND nn.name MATCH ${input.searchQuery + '*'}+ const query = sql<SelectEntry>`+ SELECT e.*+ FROM entries e+ JOIN entry_names en ON e.id = en.id+ WHERE e.type = 'record'+ AND e.parent_id = ${input.databaseId}+ AND en.name MATCH ${input.searchQuery + '*'}${exclude.length > 0- ? sql`AND n.id NOT IN (${sql.join(+ ? sql`AND e.id NOT IN (${sql.join(exclude.map((id) => sql`${id}`),sql`, `)})`@@ -112,14 +112,14 @@ export class RecordSearchQueryHandlerprivate async fetchRecords(input: RecordSearchQueryInput- ): Promise<SelectNode[]> {+ ): Promise<SelectEntry[]> {const workspaceDatabase = await databaseService.getWorkspaceDatabase(input.userId);const exclude = input.exclude ?? [];return workspaceDatabase- .selectFrom('nodes')+ .selectFrom('entries').where('type', '=', 'record').where('parent_id', '=', input.databaseId).where('id', 'not in', exclude)@@ -127,7 +127,7 @@ export class RecordSearchQueryHandler.execute();}- private buildRecordNodes = (rows: SelectNode[]): RecordNode[] => {- return rows.map((row) => mapNode(row) as RecordNode);+ private buildRecordEntries = (rows: SelectEntry[]): RecordEntry[] => {+ return rows.map((row) => mapEntry(row) as RecordEntry);};}diff --git a/apps/desktop/src/main/scheduler.ts b/apps/desktop/src/main/scheduler.tsindex 72e677af..7045e226 100644--- a/apps/desktop/src/main/scheduler.ts+++ b/apps/desktop/src/main/scheduler.ts@@ -10,7 +10,6 @@ import { SyncAccountJobHandler } from '@/main/jobs/sync-account';import { InitSynchronizersJobHandler } from '@/main/jobs/init-synchronizers';// import { RevertInvalidTransactionsJobHandler } from '@/main/jobs/revert-invalid-transactions';import { SyncPendingMutationsJobHandler } from '@/main/jobs/sync-pending-mutations';-import { SyncPendingInteractionsJobHandler } from '@/main/jobs/sync-pending-interactions';import { SyncDeletedTokensJobHandler } from '@/main/jobs/sync-deleted-tokens';import { ConnectSocketJobHandler } from '@/main/jobs/connect-socket';import { UploadFilesJobHandler } from '@/main/jobs/upload-files';@@ -29,7 +28,6 @@ export const jobHandlerMap: JobHandlerMap = {init_synchronizers: new InitSynchronizersJobHandler(),// revert_invalid_transactions: new RevertInvalidTransactionsJobHandler(),sync_pending_mutations: new SyncPendingMutationsJobHandler(),- sync_pending_interactions: new SyncPendingInteractionsJobHandler(),sync_deleted_tokens: new SyncDeletedTokensJobHandler(),connect_socket: new ConnectSocketJobHandler(),upload_files: new UploadFilesJobHandler(),@@ -232,11 +230,6 @@ class Scheduler {userId,});- this.schedule({- type: 'sync_pending_interactions',- userId,- });-// this.schedule({// type: 'revert_invalid_transactions',// userId,@@ -292,13 +285,6 @@ class Scheduler {return true;}- if (- state.input.type === 'sync_pending_interactions' &&- state.input.userId === userId- ) {- return true;- }-// if (// state.input.type === 'revert_invalid_transactions' &&// state.input.userId === userId@@ -354,11 +340,6 @@ class Scheduler {type: 'sync_pending_mutations',userId: event.userId,});- } else if (event.type === 'interaction_event_created') {- this.trigger({- type: 'sync_pending_interactions',- userId: event.userId,- });} else if (event.type === 'file_state_created') {this.trigger({type: 'upload_files',diff --git a/apps/desktop/src/main/services/collaboration-service.ts b/apps/desktop/src/main/services/collaboration-service.tsindex 4d62d67d..bfe7fd51 100644--- a/apps/desktop/src/main/services/collaboration-service.ts+++ b/apps/desktop/src/main/services/collaboration-service.ts@@ -12,7 +12,7 @@ class CollaborationService {collaboration: SyncCollaborationData) {this.debug(- `Applying server collaboration: ${collaboration.nodeId} for user ${userId}`+ `Applying server collaboration: ${collaboration.entryId} for user ${userId}`);const workspaceDatabase =@@ -21,7 +21,7 @@ class CollaborationService {await workspaceDatabase.insertInto('collaborations').values({- node_id: collaboration.nodeId,+ entry_id: collaboration.entryId,role: collaboration.role,created_at: collaboration.createdAt,updated_at: collaboration.updatedAt,@@ -30,7 +30,7 @@ class CollaborationService {}).onConflict((oc) =>oc- .columns(['node_id'])+ .columns(['entry_id']).doUpdateSet({role: collaboration.role,version: BigInt(collaboration.version),@@ -44,36 +44,26 @@ class CollaborationService {if (collaboration.deletedAt) {await workspaceDatabase.transaction().execute(async (tx) => {await tx- .deleteFrom('nodes')- .where('id', '=', collaboration.nodeId)+ .deleteFrom('entries')+ .where('id', '=', collaboration.entryId).execute();await tx.deleteFrom('transactions')- .where('node_id', '=', collaboration.nodeId)- .execute();-- await tx- .deleteFrom('interaction_events')- .where('node_id', '=', collaboration.nodeId)- .execute();-- await tx- .deleteFrom('interactions')- .where('node_id', '=', collaboration.nodeId)+ .where('entry_id', '=', collaboration.entryId).execute();});eventBus.publish({type: 'collaboration_deleted',userId,- nodeId: collaboration.nodeId,+ entryId: collaboration.entryId,});} else {eventBus.publish({type: 'collaboration_created',userId,- nodeId: collaboration.nodeId,+ entryId: collaboration.entryId,});}}diff --git a/apps/desktop/src/main/services/node-service.ts b/apps/desktop/src/main/services/entry-service.tssimilarity index 69%rename from apps/desktop/src/main/services/node-service.tsrename to apps/desktop/src/main/services/entry-service.tsindex 33c9837d..9d9562fe 100644--- a/apps/desktop/src/main/services/node-service.ts+++ b/apps/desktop/src/main/services/entry-service.ts@@ -4,9 +4,9 @@ import {LocalCreateTransaction,LocalDeleteTransaction,LocalUpdateTransaction,- Node,- NodeAttributes,- NodeMutationContext,+ Entry,+ EntryAttributes,+ EntryMutationContext,registry,SyncCreateTransactionData,SyncDeleteTransactionData,@@ -20,55 +20,58 @@ import { SelectWorkspace } from '@/main/data/app/schema';import { databaseService } from '@/main/data/database-service';import {SelectMutation,- SelectNode,+ SelectEntry,SelectTransaction,} from '@/main/data/workspace/schema';-import { fetchNodeAncestors, mapNode, mapTransaction } from '@/main/utils';+import { fetchEntryAncestors, mapEntry, mapTransaction } from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';const UPDATE_RETRIES_LIMIT = 20;-export type CreateNodeInput = {+export type CreateEntryInput = {id: string;- attributes: NodeAttributes;+ attributes: EntryAttributes;};-export type UpdateNodeResult =+export type UpdateEntryResult =| 'success'| 'not_found'| 'unauthorized'| 'failed'| 'invalid_attributes';-class NodeService {- private readonly debug = createDebugger('service:node');+class EntryService {+ private readonly debug = createDebugger('service:entry');- public async fetchNode(nodeId: string, userId: string): Promise<Node | null> {+ public async fetchEntry(+ entryId: string,+ userId: string+ ): Promise<Entry | null> {const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);- const nodeRow = await workspaceDatabase- .selectFrom('nodes')- .where('id', '=', nodeId)+ const entryRow = await workspaceDatabase+ .selectFrom('entries')+ .where('id', '=', entryId).selectAll().executeTakeFirst();- if (!nodeRow) {+ if (!entryRow) {return null;}- return mapNode(nodeRow);+ return mapEntry(entryRow);}- public async createNode(+ public async createEntry(userId: string,- input: CreateNodeInput | CreateNodeInput[]+ input: CreateEntryInput | CreateEntryInput[]) {- this.debug(`Creating ${Array.isArray(input) ? 'nodes' : 'node'}`);+ this.debug(`Creating ${Array.isArray(input) ? 'entries' : 'entry'}`);const workspace = await this.fetchWorkspace(userId);const inputs = Array.isArray(input) ? input : [input];- const createdNodes: SelectNode[] = [];+ const createdEntries: SelectEntry[] = [];const createdMutations: SelectMutation[] = [];const workspaceDatabase =@@ -81,17 +84,17 @@ class NodeService {throw new Error('Invalid attributes');}- let ancestors: Node[] = [];+ let ancestors: Entry[] = [];if (inputItem.attributes.parentId) {- const ancestorRows = await fetchNodeAncestors(+ const ancestorRows = await fetchEntryAncestors(transaction,inputItem.attributes.parentId);- ancestors = ancestorRows.map(mapNode);+ ancestors = ancestorRows.map(mapEntry);}const rootId = ancestors[0]?.id ?? inputItem.id;- const context = new NodeMutationContext(+ const context = new EntryMutationContext(workspace.account_id,workspace.workspace_id,userId,@@ -115,8 +118,8 @@ class NodeService {const name = model.getName(inputItem.id, inputItem.attributes);const text = model.getText(inputItem.id, inputItem.attributes);- const createdNode = await transaction- .insertInto('nodes')+ const createdEntry = await transaction+ .insertInto('entries').returningAll().values({id: inputItem.id,@@ -128,18 +131,18 @@ class NodeService {}).executeTakeFirst();- if (!createdNode) {- throw new Error('Failed to create node');+ if (!createdEntry) {+ throw new Error('Failed to create entry');}- createdNodes.push(createdNode);+ createdEntries.push(createdEntry);const createdTransaction = await transaction.insertInto('transactions').returningAll().values({id: transactionId,- node_id: inputItem.id,+ entry_id: inputItem.id,root_id: rootId,operation: 'create',data: update,@@ -188,15 +191,15 @@ class NodeService {}});- for (const createdNode of createdNodes) {+ for (const createdEntry of createdEntries) {this.debug(- `Created node ${createdNode.id} with type ${createdNode.type}`+ `Created entry ${createdEntry.id} with type ${createdEntry.type}`);eventBus.publish({- type: 'node_created',+ type: 'entry_created',userId,- node: mapNode(createdNode),+ entry: mapEntry(createdEntry),});}@@ -210,13 +213,13 @@ class NodeService {}}- public async updateNode(- nodeId: string,+ public async updateEntry(+ entryId: string,userId: string,- updater: (attributes: NodeAttributes) => NodeAttributes- ): Promise<UpdateNodeResult> {+ updater: (attributes: EntryAttributes) => EntryAttributes+ ): Promise<UpdateEntryResult> {for (let count = 0; count < UPDATE_RETRIES_LIMIT; count++) {- const result = await this.tryUpdateNode(nodeId, userId, updater);+ const result = await this.tryUpdateEntry(entryId, userId, updater);if (result) {return result;}@@ -225,32 +228,32 @@ class NodeService {return 'failed';}- private async tryUpdateNode(- nodeId: string,+ private async tryUpdateEntry(+ entryId: string,userId: string,- updater: (attributes: NodeAttributes) => NodeAttributes- ): Promise<UpdateNodeResult | null> {- this.debug(`Updating node ${nodeId}`);+ updater: (attributes: EntryAttributes) => EntryAttributes+ ): Promise<UpdateEntryResult | null> {+ this.debug(`Updating entry ${entryId}`);const workspace = await this.fetchWorkspace(userId);const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);- const ancestorRows = await fetchNodeAncestors(workspaceDatabase, nodeId);- const nodeRow = ancestorRows.find((ancestor) => ancestor.id === nodeId);- if (!nodeRow) {+ const ancestorRows = await fetchEntryAncestors(workspaceDatabase, entryId);+ const entryRow = ancestorRows.find((ancestor) => ancestor.id === entryId);+ if (!entryRow) {return 'not_found';}- const ancestors = ancestorRows.map(mapNode);- const node = mapNode(nodeRow);+ const ancestors = ancestorRows.map(mapEntry);+ const entry = mapEntry(entryRow);- if (!node) {+ if (!entry) {return 'not_found';}- const context = new NodeMutationContext(+ const context = new EntryMutationContext(workspace.account_id,workspace.workspace_id,userId,@@ -260,21 +263,21 @@ class NodeService {const transactionId = generateId(IdType.Transaction);const updatedAt = new Date().toISOString();- const updatedAttributes = updater(node.attributes);+ const updatedAttributes = updater(entry.attributes);- const model = registry.getModel(node.type);+ const model = registry.getModel(entry.type);if (!model.schema.safeParse(updatedAttributes).success) {return 'invalid_attributes';}- if (!model.canUpdate(context, node, updatedAttributes)) {+ if (!model.canUpdate(context, entry, updatedAttributes)) {return 'unauthorized';}const ydoc = new YDoc();const previousTransactions = await workspaceDatabase.selectFrom('transactions')- .where('node_id', '=', nodeId)+ .where('entry_id', '=', entryId).selectAll().execute();@@ -287,14 +290,14 @@ class NodeService {}const update = ydoc.updateAttributes(model.schema, updatedAttributes);- const name = model.getName(nodeId, updatedAttributes);- const text = model.getText(nodeId, updatedAttributes);+ const name = model.getName(entryId, updatedAttributes);+ const text = model.getText(entryId, updatedAttributes);- const { updatedNode, createdMutation } = await workspaceDatabase+ const { updatedEntry, createdMutation } = await workspaceDatabase.transaction().execute(async (trx) => {- const updatedNode = await trx- .updateTable('nodes')+ const updatedEntry = await trx+ .updateTable('entries').returningAll().set({attributes: JSON.stringify(ydoc.getAttributes()),@@ -302,20 +305,20 @@ class NodeService {updated_by: context.userId,transaction_id: transactionId,})- .where('id', '=', nodeId)- .where('transaction_id', '=', node.transactionId)+ .where('id', '=', entryId)+ .where('transaction_id', '=', entry.transactionId).executeTakeFirst();- if (!updatedNode) {- return { updatedNode: undefined };+ if (!updatedEntry) {+ return { updatedEntry: undefined };}const createdTransaction = await trx.insertInto('transactions').returningAll().values({id: transactionId,- node_id: nodeId,- root_id: node.rootId,+ entry_id: entryId,+ root_id: entry.rootId,operation: 'update',data: update,created_at: updatedAt,@@ -333,7 +336,7 @@ class NodeService {.returningAll().values({id: generateId(IdType.Mutation),- node_id: nodeId,+ node_id: entryId,type: 'apply_update_transaction',data: JSON.stringify(mapTransaction(createdTransaction)),created_at: updatedAt,@@ -346,80 +349,86 @@ class NodeService {}if (name !== undefined) {- await trx.deleteFrom('node_names').where('id', '=', nodeId).execute();+ await trx+ .deleteFrom('node_names')+ .where('id', '=', entryId)+ .execute();}if (name) {await trx.insertInto('node_names')- .values({ id: nodeId, name })+ .values({ id: entryId, name }).execute();}if (text !== undefined) {- await trx.deleteFrom('node_texts').where('id', '=', nodeId).execute();+ await trx+ .deleteFrom('node_texts')+ .where('id', '=', entryId)+ .execute();}if (text) {await trx.insertInto('node_texts')- .values({ id: nodeId, text })+ .values({ id: entryId, text }).execute();}return {- updatedNode,+ updatedEntry,createdMutation,};});- if (updatedNode) {+ if (updatedEntry) {this.debug(- `Updated node ${updatedNode.id} with type ${updatedNode.type}`+ `Updated entry ${updatedEntry.id} with type ${updatedEntry.type}`);eventBus.publish({- type: 'node_updated',+ type: 'entry_updated',userId,- node: mapNode(updatedNode),+ entry: mapEntry(updatedEntry),});} else {- this.debug(`Failed to update node ${nodeId}`);+ this.debug(`Failed to update entry ${entryId}`);}if (createdMutation) {- this.debug(`Created mutation ${createdMutation.id} for node ${nodeId}`);+ this.debug(`Created mutation ${createdMutation.id} for entry ${entryId}`);eventBus.publish({type: 'mutation_created',userId,});} else {- this.debug(`Failed to create mutation for node ${nodeId}`);+ this.debug(`Failed to create mutation for entry ${entryId}`);}- if (updatedNode) {+ if (updatedEntry) {return 'success';}return null;}- public async deleteNode(nodeId: string, userId: string) {+ public async deleteEntry(entryId: string, userId: string) {const workspace = await this.fetchWorkspace(userId);const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);- const ancestorRows = await fetchNodeAncestors(workspaceDatabase, nodeId);- const ancestors = ancestorRows.map(mapNode);+ const ancestorRows = await fetchEntryAncestors(workspaceDatabase, entryId);+ const ancestors = ancestorRows.map(mapEntry);- const node = ancestors.find((ancestor) => ancestor.id === nodeId);- if (!node) {- throw new Error('Node not found');+ const entry = ancestors.find((ancestor) => ancestor.id === entryId);+ if (!entry) {+ throw new Error('Entry not found');}- const model = registry.getModel(node.type);- const context = new NodeMutationContext(+ const model = registry.getModel(entry.type);+ const context = new EntryMutationContext(workspace.account_id,workspace.workspace_id,userId,@@ -427,53 +436,43 @@ class NodeService {ancestors);- if (!model.canDelete(context, node)) {+ if (!model.canDelete(context, entry)) {throw new Error('Insufficient permissions');}- const { deletedNode, createdMutation } = await workspaceDatabase+ const { deletedEntry, createdMutation } = await workspaceDatabase.transaction().execute(async (trx) => {- const deletedNode = await trx- .deleteFrom('nodes')+ const deletedEntry = await trx+ .deleteFrom('entries').returningAll()- .where('id', '=', nodeId)+ .where('id', '=', entryId).executeTakeFirst();- if (!deletedNode) {- return { deletedNode: undefined };+ if (!deletedEntry) {+ return { deletedEntry: undefined };}await trx.deleteFrom('transactions')- .where('node_id', '=', nodeId)+ .where('entry_id', '=', entryId).execute();await trx.deleteFrom('collaborations')- .where('node_id', '=', nodeId)- .execute();-- await trx- .deleteFrom('interaction_events')- .where('node_id', '=', nodeId)- .execute();-- await trx- .deleteFrom('interactions')- .where('node_id', '=', nodeId)+ .where('entry_id', '=', entryId).execute();- await trx.deleteFrom('node_names').where('id', '=', nodeId).execute();- await trx.deleteFrom('node_texts').where('id', '=', nodeId).execute();+ await trx.deleteFrom('node_names').where('id', '=', entryId).execute();+ await trx.deleteFrom('node_texts').where('id', '=', entryId).execute();const createdTransaction = await trx.insertInto('transactions').returningAll().values({id: generateId(IdType.Transaction),- node_id: nodeId,- root_id: node.rootId,+ entry_id: entryId,+ root_id: entry.rootId,operation: 'delete',data: null,created_at: new Date().toISOString(),@@ -491,7 +490,7 @@ class NodeService {.returningAll().values({id: generateId(IdType.Mutation),- node_id: nodeId,+ node_id: entryId,type: 'apply_delete_transaction',data: JSON.stringify(mapTransaction(createdTransaction)),created_at: new Date().toISOString(),@@ -499,32 +498,32 @@ class NodeService {}).executeTakeFirst();- return { deletedNode, createdMutation };+ return { deletedEntry, createdMutation };});- if (deletedNode) {+ if (deletedEntry) {this.debug(- `Deleted node ${deletedNode.id} with type ${deletedNode.type}`+ `Deleted entry ${deletedEntry.id} with type ${deletedEntry.type}`);eventBus.publish({- type: 'node_deleted',+ type: 'entry_deleted',userId,- node: mapNode(deletedNode),+ entry: mapEntry(deletedEntry),});} else {- this.debug(`Failed to delete node ${nodeId}`);+ this.debug(`Failed to delete entry ${entryId}`);}if (createdMutation) {- this.debug(`Created mutation ${createdMutation.id} for node ${nodeId}`);+ this.debug(`Created mutation ${createdMutation.id} for entry ${entryId}`);eventBus.publish({type: 'mutation_created',userId,});} else {- this.debug(`Failed to create mutation for node ${nodeId}`);+ this.debug(`Failed to create mutation for entry ${entryId}`);}}@@ -543,14 +542,14 @@ class NodeService {public async replaceTransactions(userId: string,- nodeId: string,+ entryId: string,transactions: SyncTransactionData[],transactionCursor: bigint): Promise<boolean> {for (let count = 0; count < UPDATE_RETRIES_LIMIT; count++) {const result = await this.tryReplaceTransactions(userId,- nodeId,+ entryId,transactions,transactionCursor);@@ -565,7 +564,7 @@ class NodeService {public async tryReplaceTransactions(userId: string,- nodeId: string,+ entryId: string,transactions: SyncTransactionData[],transactionCursor: bigint): Promise<boolean | null> {@@ -596,28 +595,28 @@ class NodeService {ydoc.applyUpdate(transaction.data);}- const attributes = ydoc.getAttributes<NodeAttributes>();+ const attributes = ydoc.getAttributes<EntryAttributes>();const model = registry.getModel(attributes.type);if (!model) {return false;}const attributesJson = JSON.stringify(attributes);- const name = model.getName(nodeId, attributes);- const text = model.getText(nodeId, attributes);+ const name = model.getName(entryId, attributes);+ const text = model.getText(entryId, attributes);- const existingNode = await workspaceDatabase- .selectFrom('nodes')+ const existingEntry = await workspaceDatabase+ .selectFrom('entries').selectAll()- .where('id', '=', nodeId)+ .where('id', '=', entryId).executeTakeFirst();- if (existingNode) {- const updatedNode = await workspaceDatabase+ if (existingEntry) {+ const updatedEntry = await workspaceDatabase.transaction().execute(async (trx) => {- const updatedNode = await trx- .updateTable('nodes')+ const updatedEntry = await trx+ .updateTable('entries').returningAll().set({attributes: attributesJson,@@ -631,17 +630,17 @@ class NodeService {: null,transaction_id: lastTransaction.id,})- .where('id', '=', nodeId)- .where('transaction_id', '=', existingNode.transaction_id)+ .where('id', '=', entryId)+ .where('transaction_id', '=', existingEntry.transaction_id).executeTakeFirst();- if (!updatedNode) {+ if (!updatedEntry) {return undefined;}await trx.deleteFrom('transactions')- .where('node_id', '=', nodeId)+ .where('entry_id', '=', entryId).execute();await trx@@ -649,7 +648,7 @@ class NodeService {.values(transactions.map((t) => ({id: t.id,- node_id: t.nodeId,+ entry_id: t.entryId,root_id: t.rootId,operation: t.operation,data:@@ -666,29 +665,35 @@ class NodeService {).execute();- await trx.deleteFrom('node_names').where('id', '=', nodeId).execute();- await trx.deleteFrom('node_texts').where('id', '=', nodeId).execute();+ await trx+ .deleteFrom('node_names')+ .where('id', '=', entryId)+ .execute();+ await trx+ .deleteFrom('node_texts')+ .where('id', '=', entryId)+ .execute();if (name) {await trx.insertInto('node_names')- .values({ id: nodeId, name })+ .values({ id: entryId, name }).execute();}if (text) {await trx.insertInto('node_texts')- .values({ id: nodeId, text })+ .values({ id: entryId, text }).execute();}});- if (updatedNode) {+ if (updatedEntry) {eventBus.publish({- type: 'node_updated',+ type: 'entry_updated',userId,- node: mapNode(updatedNode),+ entry: mapEntry(updatedEntry),});return true;@@ -697,14 +702,14 @@ class NodeService {return null;}- const createdNode = await workspaceDatabase+ const createdEntry = await workspaceDatabase.transaction().execute(async (trx) => {- const createdNode = await trx- .insertInto('nodes')+ const createdEntry = await trx+ .insertInto('entries').returningAll().values({- id: nodeId,+ id: entryId,root_id: firstTransaction.rootId,attributes: attributesJson,created_at: firstTransaction.createdAt,@@ -722,13 +727,13 @@ class NodeService {.onConflict((b) => b.doNothing()).executeTakeFirst();- if (!createdNode) {+ if (!createdEntry) {return undefined;}await trx.deleteFrom('transactions')- .where('node_id', '=', nodeId)+ .where('entry_id', '=', entryId).execute();await trx@@ -736,7 +741,7 @@ class NodeService {.values(transactions.map((t) => ({id: t.id,- node_id: t.nodeId,+ entry_id: t.entryId,root_id: t.rootId,operation: t.operation,data:@@ -751,29 +756,29 @@ class NodeService {).execute();- await trx.deleteFrom('node_names').where('id', '=', nodeId).execute();- await trx.deleteFrom('node_texts').where('id', '=', nodeId).execute();+ await trx.deleteFrom('node_names').where('id', '=', entryId).execute();+ await trx.deleteFrom('node_texts').where('id', '=', entryId).execute();if (name) {await trx.insertInto('node_names')- .values({ id: nodeId, name })+ .values({ id: entryId, name }).execute();}if (text) {await trx.insertInto('node_texts')- .values({ id: nodeId, text })+ .values({ id: entryId, text }).execute();}});- if (createdNode) {+ if (createdEntry) {eventBus.publish({- type: 'node_created',+ type: 'entry_created',userId,- node: mapNode(createdNode),+ entry: mapEntry(createdEntry),});return true;@@ -787,7 +792,7 @@ class NodeService {transaction: SyncCreateTransactionData) {this.debug(- `Applying server create transaction ${transaction.id} for node ${transaction.nodeId}`+ `Applying server create transaction ${transaction.id} for entry ${transaction.entryId}`);const workspaceDatabase =@@ -806,7 +811,7 @@ class NodeService {existingTransaction.server_created_at === transaction.serverCreatedAt) {this.debug(- `Server create transaction ${transaction.id} for node ${transaction.nodeId} is already synced`+ `Server create transaction ${transaction.id} for entry ${transaction.entryId} is already synced`);return;}@@ -821,31 +826,31 @@ class NodeService {.execute();this.debug(- `Server create transaction ${transaction.id} for node ${transaction.nodeId} has been synced`+ `Server create transaction ${transaction.id} for entry ${transaction.entryId} has been synced`);return;}const ydoc = new YDoc();ydoc.applyUpdate(transaction.data);- const attributes = ydoc.getAttributes<NodeAttributes>();+ const attributes = ydoc.getAttributes<EntryAttributes>();const model = registry.getModel(attributes.type);if (!model) {return;}- const name = model.getName(transaction.nodeId, attributes);- const text = model.getText(transaction.nodeId, attributes);+ const name = model.getName(transaction.entryId, attributes);+ const text = model.getText(transaction.entryId, attributes);- const { createdNode } = await workspaceDatabase+ const { createdEntry } = await workspaceDatabase.transaction().execute(async (trx) => {- const createdNode = await trx- .insertInto('nodes')+ const createdEntry = await trx+ .insertInto('entries').returningAll().values({- id: transaction.nodeId,+ id: transaction.entryId,root_id: transaction.rootId,attributes: JSON.stringify(attributes),created_at: transaction.createdAt,@@ -858,7 +863,7 @@ class NodeService {.insertInto('transactions').values({id: transaction.id,- node_id: transaction.nodeId,+ entry_id: transaction.entryId,root_id: transaction.rootId,operation: 'create',data: decodeState(transaction.data),@@ -872,35 +877,35 @@ class NodeService {if (name) {await trx.insertInto('node_names')- .values({ id: transaction.nodeId, name })+ .values({ id: transaction.entryId, name }).execute();}if (text) {await trx.insertInto('node_texts')- .values({ id: transaction.nodeId, text })+ .values({ id: transaction.entryId, text }).execute();}- return { createdNode };+ return { createdEntry };});- if (!createdNode) {+ if (!createdEntry) {this.debug(- `Server create transaction ${transaction.id} for node ${transaction.nodeId} is incomplete`+ `Server create transaction ${transaction.id} for entry ${transaction.entryId} is incomplete`);return;}this.debug(- `Created node ${createdNode.id} with type ${createdNode.type} with transaction ${transaction.id}`+ `Created entry ${createdEntry.id} with type ${createdEntry.type} with transaction ${transaction.id}`);eventBus.publish({- type: 'node_created',+ type: 'entry_created',userId,- node: mapNode(createdNode),+ entry: mapEntry(createdEntry),});}@@ -924,7 +929,7 @@ class NodeService {existingTransaction.server_created_at === transaction.serverCreatedAt) {this.debug(- `Server update transaction ${transaction.id} for node ${transaction.nodeId} is already synced`+ `Server update transaction ${transaction.id} for entry ${transaction.entryId} is already synced`);return;}@@ -939,12 +944,12 @@ class NodeService {.execute();this.debug(- `Server update transaction ${transaction.id} for node ${transaction.nodeId} has been synced`+ `Server update transaction ${transaction.id} for entry ${transaction.entryId} has been synced`);return;}- const model = registry.getModel(transaction.nodeId);+ const model = registry.getModel(transaction.entryId);if (!model) {return;}@@ -952,7 +957,7 @@ class NodeService {const previousTransactions = await workspaceDatabase.selectFrom('transactions').selectAll()- .where('node_id', '=', transaction.nodeId)+ .where('entry_id', '=', transaction.entryId).orderBy('id', 'asc').execute();@@ -965,16 +970,16 @@ class NodeService {}ydoc.applyUpdate(transaction.data);- const attributes = ydoc.getAttributes<NodeAttributes>();+ const attributes = ydoc.getAttributes<EntryAttributes>();- const name = model.getName(transaction.nodeId, attributes);- const text = model.getText(transaction.nodeId, attributes);+ const name = model.getName(transaction.entryId, attributes);+ const text = model.getText(transaction.entryId, attributes);- const { updatedNode } = await workspaceDatabase+ const { updatedEntry } = await workspaceDatabase.transaction().execute(async (trx) => {- const updatedNode = await trx- .updateTable('nodes')+ const updatedEntry = await trx+ .updateTable('entries').returningAll().set({attributes: JSON.stringify(attributes),@@ -982,14 +987,14 @@ class NodeService {updated_by: transaction.createdBy,transaction_id: transaction.id,})- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).executeTakeFirst();await trx.insertInto('transactions').values({id: transaction.id,- node_id: transaction.nodeId,+ entry_id: transaction.entryId,root_id: transaction.rootId,operation: 'update',data: decodeState(transaction.data),@@ -1003,49 +1008,49 @@ class NodeService {if (name !== undefined) {await trx.deleteFrom('node_names')- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).execute();}if (name) {await trx.insertInto('node_names')- .values({ id: transaction.nodeId, name })+ .values({ id: transaction.entryId, name }).execute();}if (text !== undefined) {await trx.deleteFrom('node_texts')- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).execute();}if (text) {await trx.insertInto('node_texts')- .values({ id: transaction.nodeId, text })+ .values({ id: transaction.entryId, text }).execute();}- return { updatedNode };+ return { updatedEntry };});- if (!updatedNode) {+ if (!updatedEntry) {this.debug(- `Server update transaction ${transaction.id} for node ${transaction.nodeId} is incomplete`+ `Server update transaction ${transaction.id} for entry ${transaction.entryId} is incomplete`);return;}this.debug(- `Updated node ${updatedNode.id} with type ${updatedNode.type} with transaction ${transaction.id}`+ `Updated entry ${updatedEntry.id} with type ${updatedEntry.type} with transaction ${transaction.id}`);eventBus.publish({- type: 'node_updated',+ type: 'entry_updated',userId,- node: mapNode(updatedNode),+ entry: mapEntry(updatedEntry),});}@@ -1054,66 +1059,56 @@ class NodeService {transaction: SyncDeleteTransactionData) {this.debug(- `Applying server delete transaction ${transaction.id} for node ${transaction.nodeId}`+ `Applying server delete transaction ${transaction.id} for entry ${transaction.entryId}`);const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);- const node = await workspaceDatabase- .selectFrom('nodes')+ const entry = await workspaceDatabase+ .selectFrom('entries').selectAll()- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).executeTakeFirst();- if (!node) {+ if (!entry) {return;}await workspaceDatabase.transaction().execute(async (trx) => {await trx- .deleteFrom('nodes')- .where('id', '=', transaction.nodeId)+ .deleteFrom('entries')+ .where('id', '=', transaction.entryId).execute();await trx.deleteFrom('transactions')- .where('node_id', '=', transaction.nodeId)- .execute();-- await trx- .deleteFrom('interactions')- .where('node_id', '=', transaction.nodeId)- .execute();-- await trx- .deleteFrom('interaction_events')- .where('node_id', '=', transaction.nodeId)+ .where('entry_id', '=', transaction.entryId).execute();await trx.deleteFrom('collaborations')- .where('node_id', '=', transaction.nodeId)+ .where('entry_id', '=', transaction.entryId).execute();await trx.deleteFrom('node_names')- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).execute();await trx.deleteFrom('node_texts')- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).execute();});this.debug(- `Deleted node ${node.id} with type ${node.type} with transaction ${transaction.id}`+ `Deleted entry ${entry.id} with type ${entry.type} with transaction ${transaction.id}`);eventBus.publish({- type: 'node_deleted',+ type: 'entry_deleted',userId,- node: mapNode(node),+ entry: mapEntry(entry),});}@@ -1124,13 +1119,13 @@ class NodeService {const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);- const node = await workspaceDatabase- .selectFrom('nodes')+ const entry = await workspaceDatabase+ .selectFrom('entries').selectAll()- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).executeTakeFirst();- if (!node) {+ if (!entry) {return;}@@ -1146,8 +1141,8 @@ class NodeService {await workspaceDatabase.transaction().execute(async (tx) => {await tx- .deleteFrom('nodes')- .where('id', '=', transaction.nodeId)+ .deleteFrom('entries')+ .where('id', '=', transaction.entryId).execute();await tx@@ -1157,24 +1152,14 @@ class NodeService {await tx.deleteFrom('collaborations')- .where('node_id', '=', transaction.nodeId)- .execute();-- await tx- .deleteFrom('interaction_events')- .where('node_id', '=', transaction.nodeId)- .execute();-- await tx- .deleteFrom('interactions')- .where('node_id', '=', transaction.nodeId)+ .where('entry_id', '=', transaction.entryId).execute();});eventBus.publish({- type: 'node_deleted',+ type: 'entry_deleted',userId,- node: mapNode(node),+ entry: mapEntry(entry),});}@@ -1198,13 +1183,13 @@ class NodeService {const workspaceDatabase =await databaseService.getWorkspaceDatabase(userId);- const node = await workspaceDatabase- .selectFrom('nodes')+ const entry = await workspaceDatabase+ .selectFrom('entries').selectAll()- .where('id', '=', transaction.nodeId)+ .where('id', '=', transaction.entryId).executeTakeFirst();- if (!node) {+ if (!entry) {return true;}@@ -1221,11 +1206,11 @@ class NodeService {const previousTransactions = await workspaceDatabase.selectFrom('transactions').selectAll()- .where('node_id', '=', transaction.nodeId)+ .where('entry_id', '=', transaction.entryId).orderBy('id', 'asc').execute();- const model = registry.getModel(node.type);+ const model = registry.getModel(entry.type);if (!model) {return true;}@@ -1249,11 +1234,11 @@ class NodeService {return true;}- const updatedNode = await workspaceDatabase+ const updatedEntry = await workspaceDatabase.transaction().execute(async (trx) => {- const updatedNode = await trx- .updateTable('nodes')+ const updatedEntry = await trx+ .updateTable('entries').returningAll().set({attributes: JSON.stringify(ydoc.getAttributes()),@@ -1261,11 +1246,11 @@ class NodeService {updated_by: lastTransaction.created_by,transaction_id: lastTransaction.id,})- .where('id', '=', transaction.nodeId)- .where('transaction_id', '=', node.transaction_id)+ .where('id', '=', transaction.entryId)+ .where('transaction_id', '=', entry.transaction_id).executeTakeFirst();- if (!updatedNode) {+ if (!updatedEntry) {return undefined;}@@ -1275,11 +1260,11 @@ class NodeService {.execute();});- if (updatedNode) {+ if (updatedEntry) {eventBus.publish({- type: 'node_updated',+ type: 'entry_updated',userId,- node: mapNode(updatedNode),+ entry: mapEntry(updatedEntry),});return true;@@ -1326,4 +1311,4 @@ class NodeService {}}-export const nodeService = new NodeService();+export const entryService = new EntryService();diff --git a/apps/desktop/src/main/services/file-service.ts b/apps/desktop/src/main/services/file-service.tsindex 214f1a98..f615418a 100644--- a/apps/desktop/src/main/services/file-service.ts+++ b/apps/desktop/src/main/services/file-service.ts@@ -495,6 +495,7 @@ class FileService {version,type: file.type,parent_id: file.parentId,+ entry_id: file.entryId,root_id: file.rootId,name: file.name,original_name: file.originalName,diff --git a/apps/desktop/src/main/services/interaction-service.ts b/apps/desktop/src/main/services/interaction-service.tsdeleted file mode 100644index 0495bafc..00000000--- a/apps/desktop/src/main/services/interaction-service.ts+++ /dev/null@@ -1,421 +0,0 @@-import {- generateId,- IdType,- InteractionAttribute,- InteractionAttributes,- mergeInteractionAttributes,- ServerInteraction,-} from '@colanode/core';-import { sql } from 'kysely';--import { databaseService } from '@/main/data/database-service';-import {- CreateInteractionEvent,- SelectInteractionEvent,-} from '@/main/data/workspace/schema';-import { mapInteraction } from '@/main/utils';-import { eventBus } from '@/shared/lib/event-bus';--const UPDATE_RETRIES_COUNT = 10;--type ServerAttributesMergeResult = {- attributes: InteractionAttributes;- toDeleteEventIds: string[];-};--export type UpdateInteractionInput = {- attribute: InteractionAttribute;- value: string;-};--class InteractionService {- public async setInteraction(- userId: string,- nodeId: string,- input: UpdateInteractionInput | UpdateInteractionInput[]- ) {- for (let i = 0; i < UPDATE_RETRIES_COUNT; i++) {- const updated = await this.tryUpdateInteraction(userId, nodeId, input);-- if (updated) {- return true;- }- }-- return false;- }-- private async tryUpdateInteraction(- userId: string,- nodeId: string,- input: UpdateInteractionInput | UpdateInteractionInput[]- ): Promise<boolean> {- const workspaceDatabase =- await databaseService.getWorkspaceDatabase(userId);-- const interaction = await workspaceDatabase- .selectFrom('interactions')- .selectAll()- .where('node_id', '=', nodeId)- .where('user_id', '=', userId)- .executeTakeFirst();-- const existingAttributes = interaction?.attributes- ? JSON.parse(interaction.attributes)- : null;-- const eventsToCreate: CreateInteractionEvent[] = [];- let attributes: InteractionAttributes | null = {- ...existingAttributes,- };-- const inputs = Array.isArray(input) ? input : [input];-- for (const input of inputs) {- const merged = mergeInteractionAttributes(- attributes,- input.attribute,- input.value- );-- if (merged) {- attributes = merged;-- eventsToCreate.push({- node_id: nodeId,- attribute: input.attribute,- value: input.value,- created_at: new Date().toISOString(),- event_id: generateId(IdType.Event),- sent_count: 0,- });- }- }-- if (eventsToCreate.length === 0) {- return true;- }-- if (!attributes) {- return true;- }-- if (interaction) {- const { updatedInteraction } = await workspaceDatabase- .transaction()- .execute(async (tx) => {- const updatedInteraction = await tx- .updateTable('interactions')- .returningAll()- .set({- attributes: JSON.stringify(attributes),- updated_at: new Date().toISOString(),- })- .where('node_id', '=', nodeId)- .where('user_id', '=', userId)- .where('version', '=', interaction.version)- .executeTakeFirst();-- if (!updatedInteraction) {- return { updatedInteraction: undefined };- }-- await tx- .insertInto('interaction_events')- .values(eventsToCreate)- .onConflict((b) =>- b.columns(['node_id', 'attribute']).doUpdateSet({- value: sql`excluded.value`,- sent_at: null,- sent_count: 0,- event_id: sql`excluded.event_id`,- })- )- .execute();-- return { updatedInteraction };- });-- if (updatedInteraction) {- eventBus.publish({- type: 'interaction_updated',- userId,- interaction: mapInteraction(updatedInteraction),- });-- eventBus.publish({- type: 'interaction_event_created',- userId,- nodeId,- });-- return true;- }-- return false;- }-- const { createdInteraction } = await workspaceDatabase- .transaction()- .execute(async (tx) => {- const createdInteraction = await tx- .insertInto('interactions')- .returningAll()- .values({- node_id: nodeId,- user_id: userId,- attributes: JSON.stringify(attributes),- created_at: new Date().toISOString(),- version: BigInt(0),- })- .onConflict((b) => b.columns(['node_id', 'user_id']).doNothing())- .executeTakeFirst();-- if (!createdInteraction) {- return { createdInteraction: undefined };- }-- await tx- .insertInto('interaction_events')- .values(eventsToCreate)- .onConflict((b) =>- b.columns(['node_id', 'attribute']).doUpdateSet({- value: sql`excluded.value`,- sent_at: null,- sent_count: 0,- event_id: sql`excluded.event_id`,- })- )- .execute();-- return { createdInteraction };- });-- if (createdInteraction) {- eventBus.publish({- type: 'interaction_updated',- userId,- interaction: mapInteraction(createdInteraction),- });-- eventBus.publish({- type: 'interaction_event_created',- userId,- nodeId,- });-- return true;- }-- return false;- }-- public async applyServerInteraction(- userId: string,- interaction: ServerInteraction- ) {- if (interaction.userId !== userId) {- await this.replaceInteraction(userId, interaction);- return true;- }-- for (let i = 0; i < UPDATE_RETRIES_COUNT; i++) {- const updated = await this.tryApplyServerInteraction(userId, interaction);-- if (updated) {- return true;- }- }-- return false;- }-- private async replaceInteraction(- userId: string,- interaction: ServerInteraction- ) {- const workspaceDatabase =- await databaseService.getWorkspaceDatabase(userId);-- const createdInteraction = await workspaceDatabase- .insertInto('interactions')- .returningAll()- .values({- user_id: interaction.userId,- node_id: interaction.nodeId,- attributes: JSON.stringify(interaction.attributes),- created_at: interaction.createdAt,- updated_at: interaction.updatedAt,- server_created_at: interaction.serverCreatedAt,- server_updated_at: interaction.serverUpdatedAt,- version: BigInt(interaction.version),- })- .onConflict((b) =>- b.columns(['node_id', 'user_id']).doUpdateSet({- attributes: JSON.stringify(interaction.attributes),- updated_at: interaction.updatedAt,- server_updated_at: interaction.serverUpdatedAt,- version: BigInt(interaction.version),- })- )- .executeTakeFirst();-- if (createdInteraction) {- eventBus.publish({- type: 'interaction_updated',- userId,- interaction: mapInteraction(createdInteraction),- });- }-- return createdInteraction;- }-- private async tryApplyServerInteraction(- userId: string,- interaction: ServerInteraction- ): Promise<boolean> {- const workspaceDatabase =- await databaseService.getWorkspaceDatabase(userId);-- const existingInteraction = await workspaceDatabase- .selectFrom('interactions')- .selectAll()- .where('node_id', '=', interaction.nodeId)- .where('user_id', '=', userId)- .executeTakeFirst();-- const interactionEvents = await workspaceDatabase- .selectFrom('interaction_events')- .selectAll()- .where('node_id', '=', interaction.nodeId)- .execute();-- const { attributes, toDeleteEventIds } = this.mergeServerAttributes(- interaction.attributes,- interactionEvents- );-- if (existingInteraction) {- const { updatedInteraction } = await workspaceDatabase- .transaction()- .execute(async (tx) => {- const updatedInteraction = await tx- .updateTable('interactions')- .returningAll()- .set({- attributes: JSON.stringify(attributes),- updated_at: interaction.updatedAt,- server_updated_at: interaction.serverUpdatedAt,- version: BigInt(interaction.version),- })- .where('node_id', '=', interaction.nodeId)- .where('user_id', '=', userId)- .where('version', '=', existingInteraction.version)- .executeTakeFirst();-- if (!updatedInteraction) {- return { updatedInteraction: undefined };- }-- if (toDeleteEventIds.length > 0) {- await tx- .deleteFrom('interaction_events')- .where('node_id', '=', interaction.nodeId)- .where('event_id', 'in', toDeleteEventIds)- .execute();- }-- return { updatedInteraction };- });-- if (updatedInteraction) {- eventBus.publish({- type: 'interaction_updated',- userId,- interaction: mapInteraction(updatedInteraction),- });-- return true;- }-- return false;- }-- const { createdInteraction } = await workspaceDatabase- .transaction()- .execute(async (tx) => {- const createdInteraction = await tx- .insertInto('interactions')- .returningAll()- .values({- user_id: interaction.userId,- node_id: interaction.nodeId,- attributes: JSON.stringify(attributes),- created_at: interaction.createdAt,- updated_at: interaction.updatedAt,- server_created_at: interaction.serverCreatedAt,- server_updated_at: interaction.serverUpdatedAt,- version: BigInt(interaction.version),- })- .onConflict((b) => b.columns(['node_id', 'user_id']).doNothing())- .executeTakeFirst();-- if (!createdInteraction) {- return { createdInteraction: undefined };- }-- if (toDeleteEventIds.length > 0) {- await tx- .deleteFrom('interaction_events')- .where('node_id', '=', interaction.nodeId)- .where('event_id', 'in', toDeleteEventIds)- .execute();- }-- return { createdInteraction };- });-- if (createdInteraction) {- eventBus.publish({- type: 'interaction_updated',- userId,- interaction: mapInteraction(createdInteraction),- });-- return true;- }-- return false;- }-- private mergeServerAttributes(- attributes: InteractionAttributes,- events: SelectInteractionEvent[]- ): ServerAttributesMergeResult {- if (events.length === 0) {- return { attributes, toDeleteEventIds: [] };- }-- let result = { ...attributes };- const toDeleteEventIds: string[] = [];-- for (const event of events) {- const merged = mergeInteractionAttributes(- result,- event.attribute,- event.value- );-- if (merged) {- result = merged;- } else {- toDeleteEventIds.push(event.event_id);- }- }-- return { attributes: result, toDeleteEventIds };- }-}--export const interactionService = new InteractionService();diff --git a/apps/desktop/src/main/services/message-service.ts b/apps/desktop/src/main/services/message-service.tsindex dd0eea88..f6500451 100644--- a/apps/desktop/src/main/services/message-service.ts+++ b/apps/desktop/src/main/services/message-service.ts@@ -60,8 +60,8 @@ class MessageService {id: message.id,version,type: message.type,- parent_id: message.nodeId,- node_id: message.nodeId,+ parent_id: message.entryId,+ entry_id: message.entryId,root_id: message.rootId,content: JSON.stringify(message.content),created_at: message.createdAt,diff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.tsindex 07ebd6c2..824301e0 100644--- a/apps/desktop/src/main/services/radar-service.ts+++ b/apps/desktop/src/main/services/radar-service.ts@@ -1,10 +1,5 @@-import {- compareDate,- getIdType,- IdType,- InteractionAttributes,-} from '@colanode/core';-import { Kysely, sql } from 'kysely';+import { IdType } from '@colanode/core';+import { Kysely } from 'kysely';import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';import { mapWorkspace } from '@/main/utils';@@ -55,7 +50,7 @@ class RadarWorkspace {if (!nodeState) {nodeState = {type: 'channel',- nodeId: unreadMessage.parentId,+ channelId: unreadMessage.parentId,unseenMessagesCount: 0,mentionsCount: 0,};@@ -71,7 +66,7 @@ class RadarWorkspace {if (!nodeState) {nodeState = {type: 'chat',- nodeId: unreadMessage.parentId,+ chatId: unreadMessage.parentId,unseenMessagesCount: 0,mentionsCount: 0,};@@ -87,106 +82,93 @@ class RadarWorkspace {}public async init(): Promise<void> {- const unreadMessagesRows = await this.workspaceDatabase- .selectFrom('nodes as node')- .innerJoin('interactions as node_interactions', (join) =>- join- .onRef('node.id', '=', 'node_interactions.node_id')- .on('node_interactions.user_id', '=', this.workspace.userId)- )- .innerJoin('interactions as parent_interactions', (join) =>- join- .onRef('node.parent_id', '=', 'parent_interactions.node_id')- .on('parent_interactions.user_id', '=', this.workspace.userId)- )- .select(['node.id as node_id', 'node.parent_id as parent_id'])- .where('node.created_by', '!=', this.workspace.userId)- .where('node_interactions.last_seen_at', 'is', null)- .where('parent_interactions.last_seen_at', 'is not', null)- .whereRef(- 'node.created_at',- '>=',- sql`json_extract(parent_interactions.attributes, '$.firstSeenAt')`- )- .execute();-- for (const unreadMessageRow of unreadMessagesRows) {- this.unreadMessages.set(unreadMessageRow.node_id, {- messageId: unreadMessageRow.node_id,- parentId: unreadMessageRow.parent_id,- parentIdType: getIdType(unreadMessageRow.parent_id),- });- }+ // const unreadMessagesRows = await this.workspaceDatabase+ // .selectFrom('entries as entry')+ // .innerJoin('interactions as entry_interactions', (join) =>+ // join+ // .onRef('entry.id', '=', 'entry_interactions.entry_id')+ // .on('entry_interactions.user_id', '=', this.workspace.userId)+ // )+ // .innerJoin('interactions as parent_interactions', (join) =>+ // join+ // .onRef('node.parent_id', '=', 'parent_interactions.node_id')+ // .on('parent_interactions.user_id', '=', this.workspace.userId)+ // )+ // .select(['node.id as node_id', 'node.parent_id as parent_id'])+ // .where('node.created_by', '!=', this.workspace.userId)+ // .where('node_interactions.last_seen_at', 'is', null)+ // .where('parent_interactions.last_seen_at', 'is not', null)+ // .whereRef(+ // 'node.created_at',+ // '>=',+ // sql`json_extract(parent_interactions.attributes, '$.firstSeenAt')`+ // )+ // .execute();+ // for (const unreadMessageRow of unreadMessagesRows) {+ // this.unreadMessages.set(unreadMessageRow.node_id, {+ // messageId: unreadMessageRow.node_id,+ // parentId: unreadMessageRow.parent_id,+ // parentIdType: getIdType(unreadMessageRow.parent_id),+ // });+ // }}public async handleInteractionUpdated(- event: InteractionUpdatedEvent+ _: InteractionUpdatedEvent): Promise<void> {- const interaction = event.interaction;- if (- event.userId !== this.workspace.userId ||- interaction.userId !== this.workspace.userId- ) {- return;- }-- if (interaction.attributes.lastSeenAt) {- const unreadMessage = this.unreadMessages.get(interaction.nodeId);- if (unreadMessage) {- this.unreadMessages.delete(interaction.nodeId);-- eventBus.publish({- type: 'radar_data_updated',- });- }-- return;- }-- if (this.unreadMessages.has(interaction.nodeId)) {- return;- }-- const node = await this.workspaceDatabase- .selectFrom('nodes')- .selectAll()- .where('id', '=', interaction.nodeId)- .executeTakeFirst();-- if (!node) {- return;- }-- const parentInteraction = await this.workspaceDatabase- .selectFrom('interactions')- .selectAll()- .where('node_id', '=', node.parent_id)- .executeTakeFirst();-- if (!parentInteraction || !parentInteraction.last_seen_at) {- return;- }-- const parentInteractionAttributes: InteractionAttributes = JSON.parse(- parentInteraction.attributes- );-- if (- !parentInteractionAttributes.firstSeenAt ||- compareDate(parentInteractionAttributes.firstSeenAt, node.created_at) > 0- ) {- return;- }-- this.unreadMessages.set(interaction.nodeId, {- messageId: interaction.nodeId,- parentId: node.parent_id,- parentIdType: getIdType(node.parent_id),- });-- eventBus.publish({- type: 'radar_data_updated',- });+ // const interaction = event.interaction;+ // if (+ // event.userId !== this.workspace.userId ||+ // interaction.userId !== this.workspace.userId+ // ) {+ // return;+ // }+ // if (interaction.attributes.lastSeenAt) {+ // const unreadMessage = this.unreadMessages.get(interaction.nodeId);+ // if (unreadMessage) {+ // this.unreadMessages.delete(interaction.nodeId);+ // eventBus.publish({+ // type: 'radar_data_updated',+ // });+ // }+ // return;+ // }+ // if (this.unreadMessages.has(interaction.nodeId)) {+ // return;+ // }+ // const node = await this.workspaceDatabase+ // .selectFrom('nodes')+ // .selectAll()+ // .where('id', '=', interaction.nodeId)+ // .executeTakeFirst();+ // if (!node) {+ // return;+ // }+ // const parentInteraction = await this.workspaceDatabase+ // .selectFrom('interactions')+ // .selectAll()+ // .where('node_id', '=', node.parent_id)+ // .executeTakeFirst();+ // if (!parentInteraction || !parentInteraction.last_seen_at) {+ // return;+ // }+ // const parentInteractionAttributes: InteractionAttributes = JSON.parse(+ // parentInteraction.attributes+ // );+ // if (+ // !parentInteractionAttributes.firstSeenAt ||+ // compareDate(parentInteractionAttributes.firstSeenAt, node.created_at) > 0+ // ) {+ // return;+ // }+ // this.unreadMessages.set(interaction.nodeId, {+ // messageId: interaction.nodeId,+ // parentId: node.parent_id,+ // parentIdType: getIdType(node.parent_id),+ // });+ // eventBus.publish({+ // type: 'radar_data_updated',+ // });}}diff --git a/apps/desktop/src/main/services/sync-service.ts b/apps/desktop/src/main/services/sync-service.tsindex bacc71fb..cff5b04e 100644--- a/apps/desktop/src/main/services/sync-service.ts+++ b/apps/desktop/src/main/services/sync-service.ts@@ -57,7 +57,7 @@ class SyncService {.execute();for (const collaboration of collaborations) {- const rootId = collaboration.node_id;+ const rootId = collaboration.entry_id;if (collaboration.deleted_at) {this.removeRootNodeSynchronizers(userId, rootId);} else {diff --git a/apps/desktop/src/main/synchronizers/transactions.ts b/apps/desktop/src/main/synchronizers/transactions.tsindex 5bdc10d4..a87e1af1 100644--- a/apps/desktop/src/main/synchronizers/transactions.ts+++ b/apps/desktop/src/main/synchronizers/transactions.ts@@ -1,11 +1,11 @@import { SyncTransactionData, SyncTransactionsInput } from '@colanode/core';import { BaseSynchronizer } from '@/main/synchronizers/base';-import { nodeService } from '@/main/services/node-service';+import { entryService } from '@/main/services/entry-service';export class TransactionSynchronizer extends BaseSynchronizer<SyncTransactionsInput> {protected async process(data: SyncTransactionData): Promise<void> {- await nodeService.applyServerTransaction(this.userId, data);+ await entryService.applyServerTransaction(this.userId, data);}protected get cursorKey(): string {diff --git a/apps/desktop/src/main/utils.ts b/apps/desktop/src/main/utils.tsindex 87a92f82..f09f1d83 100644--- a/apps/desktop/src/main/utils.ts+++ b/apps/desktop/src/main/utils.ts@@ -1,4 +1,4 @@-import { LocalTransaction, Mutation, Node } from '@colanode/core';+import { LocalTransaction, Mutation, Entry } from '@colanode/core';import { encodeState } from '@colanode/crdt';import {DeleteResult,@@ -21,17 +21,15 @@ import {import {SelectFile,SelectFileState,- SelectInteraction,SelectMessage,SelectMessageReaction,SelectMutation,- SelectNode,+ SelectEntry,SelectTransaction,SelectUser,WorkspaceDatabaseSchema,} from '@/main/data/workspace/schema';import { Account } from '@/shared/types/accounts';-import { Interaction } from '@/shared/types/interactions';import { Server } from '@/shared/types/servers';import { User } from '@/shared/types/users';import { File, FileState } from '@/shared/types/files';@@ -88,22 +86,22 @@ export const hasDeleteChanges = (result: DeleteResult[]): boolean => {return result.some((r) => r.numDeletedRows && r.numDeletedRows > 0n);};-export const fetchNodeAncestors = (+export const fetchEntryAncestors = (database:| Kysely<WorkspaceDatabaseSchema>| Transaction<WorkspaceDatabaseSchema>,- nodeId: string-): Promise<SelectNode[]> => {+ entryId: string+): Promise<SelectEntry[]> => {return database- .selectFrom('nodes')+ .selectFrom('entries').selectAll().where('id','in',database- .selectFrom('node_paths')+ .selectFrom('entry_paths').select('ancestor_id')- .where('descendant_id', '=', nodeId)+ .where('descendant_id', '=', entryId)).execute();};@@ -154,7 +152,7 @@ export const mapUser = (row: SelectUser): User => {};};-export const mapNode = (row: SelectNode): Node => {+export const mapEntry = (row: SelectEntry): Entry => {return {id: row.id,type: row.type,@@ -199,7 +197,7 @@ export const mapTransaction = (row: SelectTransaction): LocalTransaction => {if (row.operation === 'create' && row.data) {return {id: row.id,- nodeId: row.node_id,+ entryId: row.entry_id,rootId: row.root_id,operation: 'create',data: encodeState(row.data),@@ -211,7 +209,7 @@ export const mapTransaction = (row: SelectTransaction): LocalTransaction => {if (row.operation === 'update' && row.data) {return {id: row.id,- nodeId: row.node_id,+ entryId: row.entry_id,rootId: row.root_id,operation: 'update',data: encodeState(row.data),@@ -223,7 +221,7 @@ export const mapTransaction = (row: SelectTransaction): LocalTransaction => {if (row.operation === 'delete') {return {id: row.id,- nodeId: row.node_id,+ entryId: row.entry_id,rootId: row.root_id,operation: 'delete',createdAt: row.created_at,@@ -315,20 +313,3 @@ export const mapFileState = (row: SelectFileState): FileState => {updatedAt: row.updated_at,};};--export const mapInteraction = (row: SelectInteraction): Interaction => {- return {- userId: row.user_id,- nodeId: row.node_id,- attributes: JSON.parse(row.attributes),- createdAt: new Date(row.created_at),- updatedAt: row.updated_at ? new Date(row.updated_at) : null,- serverCreatedAt: row.server_created_at- ? new Date(row.server_created_at)- : null,- serverUpdatedAt: row.server_updated_at- ? new Date(row.server_updated_at)- : null,- version: row.version ? BigInt(row.version) : null,- };-};diff --git a/apps/desktop/src/renderer/components/channels/channel-body.tsx b/apps/desktop/src/renderer/components/channels/channel-body.tsxindex 02671434..4d2fe622 100644--- a/apps/desktop/src/renderer/components/channels/channel-body.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-body.tsx@@ -1,4 +1,4 @@-import { ChannelNode, NodeRole } from '@colanode/core';+import { ChannelEntry, EntryRole } from '@colanode/core';import { useEffect } from 'react';import { Conversation } from '@/renderer/components/messages/conversation';@@ -6,8 +6,8 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useRadar } from '@/renderer/contexts/radar';interface ChannelBodyProps {- channel: ChannelNode;- role: NodeRole;+ channel: ChannelEntry;+ role: EntryRole;}export const ChannelBody = ({ channel, role }: ChannelBodyProps) => {diff --git a/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsxindex 7e5b2059..ef4e589d 100644--- a/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx@@ -1,21 +1,23 @@-import { ChannelNode } from '@colanode/core';+import { ChannelEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';interface ChannelBreadcrumbItemProps {- node: ChannelNode;+ channel: ChannelEntry;}-export const ChannelBreadcrumbItem = ({ node }: ChannelBreadcrumbItemProps) => {+export const ChannelBreadcrumbItem = ({+ channel,+}: ChannelBreadcrumbItemProps) => {return (<div className="flex items-center space-x-2"><Avatarsize="small"- id={node.id}- name={node.attributes.name}- avatar={node.attributes.avatar}+ id={channel.id}+ name={channel.attributes.name}+ avatar={channel.attributes.avatar}/>- <span>{node.attributes.name}</span>+ <span>{channel.attributes.name}</span></div>);};diff --git a/apps/desktop/src/renderer/components/channels/channel-container.tsx b/apps/desktop/src/renderer/components/channels/channel-container.tsxindex f1780f86..d050d09d 100644--- a/apps/desktop/src/renderer/components/channels/channel-container.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-container.tsx@@ -1,4 +1,4 @@-import { extractNodeRole } from '@colanode/core';+import { extractEntryRole } from '@colanode/core';import { ChannelBody } from '@/renderer/components/channels/channel-body';import { ChannelHeader } from '@/renderer/components/channels/channel-header';@@ -6,14 +6,14 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface ChannelContainerProps {- nodeId: string;+ channelId: string;}-export const ChannelContainer = ({ nodeId }: ChannelContainerProps) => {+export const ChannelContainer = ({ channelId }: ChannelContainerProps) => {const workspace = useWorkspace();const { data, isPending } = useQuery({- type: 'node_tree_get',- nodeId,+ type: 'entry_tree_get',+ entryId: channelId,userId: workspace.userId,});@@ -21,9 +21,9 @@ export const ChannelContainer = ({ nodeId }: ChannelContainerProps) => {return null;}- const nodes = data ?? [];- const channel = nodes.find((node) => node.id === nodeId);- const role = extractNodeRole(nodes, workspace.userId);+ const entries = data ?? [];+ const channel = entries.find((entry) => entry.id === channelId);+ const role = extractEntryRole(entries, workspace.userId);if (!channel || channel.type !== 'channel' || !role) {return null;@@ -31,7 +31,7 @@ export const ChannelContainer = ({ nodeId }: ChannelContainerProps) => {return (<div className="flex h-full w-full flex-col">- <ChannelHeader nodes={nodes} channel={channel} role={role} />+ <ChannelHeader entries={entries} channel={channel} role={role} /><ChannelBody channel={channel} role={role} /></div>);diff --git a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsxindex 43452ace..e7b8b0c8 100644--- a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx@@ -15,11 +15,11 @@ import { toast } from '@/renderer/hooks/use-toast';interface ChannelDeleteDialogProps {open: boolean;onOpenChange: (open: boolean) => void;- nodeId: string;+ channelId: string;}export const ChannelDeleteDialog = ({- nodeId,+ channelId,open,onOpenChange,}: ChannelDeleteDialogProps) => {@@ -47,12 +47,12 @@ export const ChannelDeleteDialog = ({mutate({input: {type: 'channel_delete',- channelId: nodeId,+ channelId,userId: workspace.userId,},onSuccess() {onOpenChange(false);- workspace.closeNode(nodeId);+ workspace.closeEntry(channelId);},onError(error) {toast({diff --git a/apps/desktop/src/renderer/components/channels/channel-header.tsx b/apps/desktop/src/renderer/components/channels/channel-header.tsxindex cdaefe1f..10b747e6 100644--- a/apps/desktop/src/renderer/components/channels/channel-header.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-header.tsx@@ -1,36 +1,34 @@-import { ChannelNode, Node, NodeRole } from '@colanode/core';+import { ChannelEntry, Entry, EntryRole } from '@colanode/core';import { ChannelSettings } from '@/renderer/components/channels/channel-settings';-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';+import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';interface ChannelHeaderProps {- nodes: Node[];- channel: ChannelNode;- role: NodeRole;+ entries: Entry[];+ channel: ChannelEntry;+ role: EntryRole;}-export const ChannelHeader = ({ nodes, channel, role }: ChannelHeaderProps) => {+export const ChannelHeader = ({+ entries,+ channel,+ role,+}: ChannelHeaderProps) => {const container = useContainer();return (<Header><div className="flex w-full items-center gap-2 px-4"><div className="flex-grow">- {container.mode === 'main' && <NodeBreadcrumb nodes={nodes} />}+ {container.mode === 'main' && <EntryBreadcrumb entries={entries} />}{container.mode === 'modal' && (- <NodeFullscreenButton nodeId={channel.id} />+ <EntryFullscreenButton entryId={channel.id} />)}</div><div className="flex items-center gap-2">- <NodeCollaboratorsPopover- nodeId={channel.id}- nodes={nodes}- role={role}- /><ChannelSettings channel={channel} role={role} /></div></div>diff --git a/apps/desktop/src/renderer/components/channels/channel-settings.tsx b/apps/desktop/src/renderer/components/channels/channel-settings.tsxindex 5c16cbc6..46afac05 100644--- a/apps/desktop/src/renderer/components/channels/channel-settings.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-settings.tsx@@ -1,10 +1,10 @@-import { ChannelNode, hasEditorAccess, NodeRole } from '@colanode/core';+import { ChannelEntry, hasEditorAccess, EntryRole } from '@colanode/core';import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';import React from 'react';import { ChannelDeleteDialog } from '@/renderer/components/channels/channel-delete-dialog';import { ChannelUpdateDialog } from '@/renderer/components/channels/channel-update-dialog';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';+import { EntryCollaboratorAudit } from '@/renderer/components/collaborators/entry-collaborator-audit';import {DropdownMenu,DropdownMenuContent,@@ -15,8 +15,8 @@ import {} from '@/renderer/components/ui/dropdown-menu';interface ChannelSettingsProps {- channel: ChannelNode;- role: NodeRole;+ channel: ChannelEntry;+ role: EntryRole;}export const ChannelSettings = ({ channel, role }: ChannelSettingsProps) => {@@ -84,7 +84,7 @@ export const ChannelSettings = ({ channel, role }: ChannelSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Created by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={channel.createdBy}date={channel.createdAt}/>@@ -94,7 +94,7 @@ export const ChannelSettings = ({ channel, role }: ChannelSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Last updated by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={channel.updatedBy}date={channel.updatedAt}/>@@ -104,7 +104,7 @@ export const ChannelSettings = ({ channel, role }: ChannelSettingsProps) => {</DropdownMenuContent></DropdownMenu><ChannelDeleteDialog- nodeId={channel.id}+ channelId={channel.id}open={showDeleteDialog}onOpenChange={setShowDeleteModal}/>diff --git a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsxindex 4f2de4d6..d0f330f9 100644--- a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx@@ -1,4 +1,4 @@-import { ChannelNode } from '@colanode/core';+import { ChannelEntry } from '@colanode/core';import { InView } from 'react-intersection-observer';import { Avatar } from '@/renderer/components/avatars/avatar';@@ -8,15 +8,15 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { cn } from '@/shared/lib/utils';interface ChannelSidebarItemProps {- node: ChannelNode;+ channel: ChannelEntry;}-export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {+export const ChannelSidebarItem = ({ channel }: ChannelSidebarItemProps) => {const workspace = useWorkspace();const radar = useRadar();- const isActive = workspace.isNodeActive(node.id);- const channelState = radar.getChannelState(workspace.userId, node.id);+ const isActive = workspace.isEntryActive(channel.id);+ const channelState = radar.getChannelState(workspace.userId, channel.id);const unreadCount = channelState.unseenMessagesCount;const mentionsCount = channelState.mentionsCount;@@ -27,9 +27,9 @@ export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {if (inView) {radar.markAsSeen(workspace.userId,- node.id,- node.type,- node.transactionId+ channel.id,+ channel.type,+ channel.transactionId);}}}@@ -39,9 +39,9 @@ export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {)}><Avatar- id={node.id}- avatar={node.attributes.avatar}- name={node.attributes.name}+ id={channel.id}+ avatar={channel.attributes.avatar}+ name={channel.attributes.name}className="h-4 w-4"/><span@@ -50,7 +50,7 @@ export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {!isActive && unreadCount > 0 && 'font-semibold')}>- {node.attributes.name ?? 'Unnamed'}+ {channel.attributes.name ?? 'Unnamed'}</span>{!isActive && (<ReadStateIndicatordiff --git a/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsxindex ee509fde..edf64ef5 100644--- a/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx@@ -1,4 +1,4 @@-import { ChannelNode, hasEditorAccess, NodeRole } from '@colanode/core';+import { ChannelEntry, hasEditorAccess, EntryRole } from '@colanode/core';import { ChannelForm } from '@/renderer/components/channels/channel-form';import {@@ -13,8 +13,8 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface ChannelUpdateDialogProps {- channel: ChannelNode;- role: NodeRole;+ channel: ChannelEntry;+ role: EntryRole;open: boolean;onOpenChange: (open: boolean) => void;}diff --git a/apps/desktop/src/renderer/components/chats/chat-body.tsx b/apps/desktop/src/renderer/components/chats/chat-body.tsxindex ba7a2531..0d15ea99 100644--- a/apps/desktop/src/renderer/components/chats/chat-body.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-body.tsx@@ -1,4 +1,4 @@-import { ChatNode, NodeRole } from '@colanode/core';+import { ChatEntry, EntryRole } from '@colanode/core';import { useEffect } from 'react';import { Conversation } from '@/renderer/components/messages/conversation';@@ -6,8 +6,8 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useRadar } from '@/renderer/contexts/radar';interface ChatBodyProps {- chat: ChatNode;- role: NodeRole;+ chat: ChatEntry;+ role: EntryRole;}export const ChatBody = ({ chat, role }: ChatBodyProps) => {diff --git a/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsxindex c7adf147..37c597a5 100644--- a/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx@@ -1,17 +1,17 @@-import { ChatNode } from '@colanode/core';+import { ChatEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface ChatBreadcrumbItemProps {- node: ChatNode;+ chat: ChatEntry;}-export const ChatBreadcrumbItem = ({ node }: ChatBreadcrumbItemProps) => {+export const ChatBreadcrumbItem = ({ chat }: ChatBreadcrumbItemProps) => {const workspace = useWorkspace();const userId =- Object.keys(node.attributes.collaborators).find(+ Object.keys(chat.attributes.collaborators).find((id) => id !== workspace.userId) ?? '';diff --git a/apps/desktop/src/renderer/components/chats/chat-container.tsx b/apps/desktop/src/renderer/components/chats/chat-container.tsxindex 621bd19a..39231938 100644--- a/apps/desktop/src/renderer/components/chats/chat-container.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-container.tsx@@ -1,4 +1,4 @@-import { extractNodeRole } from '@colanode/core';+import { extractEntryRole } from '@colanode/core';import { ChatBody } from '@/renderer/components/chats/chat-body';import { ChatHeader } from '@/renderer/components/chats/chat-header';@@ -6,15 +6,15 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface ChatContainerProps {- nodeId: string;+ chatId: string;}-export const ChatContainer = ({ nodeId }: ChatContainerProps) => {+export const ChatContainer = ({ chatId }: ChatContainerProps) => {const workspace = useWorkspace();const { data, isPending } = useQuery({- type: 'node_get',- nodeId,+ type: 'entry_get',+ entryId: chatId,userId: workspace.userId,});@@ -27,7 +27,7 @@ export const ChatContainer = ({ nodeId }: ChatContainerProps) => {return null;}- const role = extractNodeRole(node, workspace.userId);+ const role = extractEntryRole(node, workspace.userId);if (!role) {return null;}diff --git a/apps/desktop/src/renderer/components/chats/chat-header.tsx b/apps/desktop/src/renderer/components/chats/chat-header.tsxindex 9061e212..4f94818a 100644--- a/apps/desktop/src/renderer/components/chats/chat-header.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-header.tsx@@ -1,14 +1,14 @@-import { ChatNode, NodeRole } from '@colanode/core';+import { ChatEntry, EntryRole } from '@colanode/core';-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { EntryCollaboratorsPopover } from '@/renderer/components/collaborators/entry-collaborators-popover';+import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';+import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';interface ChatHeaderProps {- chat: ChatNode;- role: NodeRole;+ chat: ChatEntry;+ role: EntryRole;}export const ChatHeader = ({ chat, role }: ChatHeaderProps) => {@@ -18,15 +18,15 @@ export const ChatHeader = ({ chat, role }: ChatHeaderProps) => {<Header><div className="flex w-full items-center gap-2 px-4"><div className="flex-grow">- <NodeBreadcrumb nodes={[chat]} />+ <EntryBreadcrumb entries={[chat]} />{container.mode === 'modal' && (- <NodeFullscreenButton nodeId={chat.id} />+ <EntryFullscreenButton entryId={chat.id} />)}</div><div className="flex items-center gap-2">- <NodeCollaboratorsPopover- nodeId={chat.id}- nodes={[chat]}+ <EntryCollaboratorsPopover+ entryId={chat.id}+ entries={[chat]}role={role}/></div>diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsxindex a2cc9ead..68b1b402 100644--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx@@ -1,4 +1,4 @@-import { ChatNode } from '@colanode/core';+import { ChatEntry } from '@colanode/core';import { InView } from 'react-intersection-observer';import { Avatar } from '@/renderer/components/avatars/avatar';@@ -9,15 +9,15 @@ import { useQuery } from '@/renderer/hooks/use-query';import { cn } from '@/shared/lib/utils';interface ChatSidebarItemProps {- node: ChatNode;+ chat: ChatEntry;}-export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {+export const ChatSidebarItem = ({ chat }: ChatSidebarItemProps) => {const workspace = useWorkspace();const radar = useRadar();const userId =- Object.keys(node.attributes.collaborators).find(+ Object.keys(chat.attributes.collaborators).find((id) => id !== workspace.userId) ?? '';@@ -31,8 +31,8 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {return null;}- const nodeReadState = radar.getChatState(workspace.userId, node.id);- const isActive = workspace.isNodeActive(node.id);+ const nodeReadState = radar.getChatState(workspace.userId, chat.id);+ const isActive = workspace.isEntryActive(chat.id);const unreadCount =nodeReadState.unseenMessagesCount + nodeReadState.mentionsCount;@@ -43,9 +43,9 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {if (inView) {radar.markAsSeen(workspace.userId,- node.id,- node.type,- node.transactionId+ chat.id,+ chat.type,+ chat.transactionId);}}}diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-audit.tsxsimilarity index 88%rename from apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsxrename to apps/desktop/src/renderer/components/collaborators/entry-collaborator-audit.tsxindex 8983fb75..65fc4fcf 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx+++ b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-audit.tsx@@ -4,15 +4,15 @@ import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-interface NodeCollaboratorAuditProps {+interface EntryCollaboratorAuditProps {collaboratorId: string;date: string;}-export const NodeCollaboratorAudit = ({+export const EntryCollaboratorAudit = ({collaboratorId,date,-}: NodeCollaboratorAuditProps) => {+}: EntryCollaboratorAuditProps) => {const workspace = useWorkspace();const { data, isPending } = useQuery({type: 'user_get',diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-create.tsxsimilarity index 77%rename from apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsxrename to apps/desktop/src/renderer/components/collaborators/entry-collaborator-create.tsxindex 5bf87790..cd1306a4 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx+++ b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-create.tsx@@ -1,23 +1,23 @@import React from 'react';import { User } from '@/shared/types/users';-import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';-import { NodeCollaboratorSearch } from '@/renderer/components/collaborators/node-collaborator-search';+import { EntryCollaboratorRoleDropdown } from '@/renderer/components/collaborators/entry-collaborator-role-dropdown';+import { EntryCollaboratorSearch } from '@/renderer/components/collaborators/entry-collaborator-search';import { Button } from '@/renderer/components/ui/button';import { Spinner } from '@/renderer/components/ui/spinner';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';-interface NodeCollaboratorCreate {- nodeId: string;+interface EntryCollaboratorCreateProps {+ entryId: string;existingCollaborators: string[];}-export const NodeCollaboratorCreate = ({- nodeId,+export const EntryCollaboratorCreate = ({+ entryId,existingCollaborators,-}: NodeCollaboratorCreate) => {+}: EntryCollaboratorCreateProps) => {const workspace = useWorkspace();const { mutate, isPending } = useMutation();@@ -26,13 +26,13 @@ export const NodeCollaboratorCreate = ({return (<div className="flex flex-col gap-2">- <NodeCollaboratorSearch+ <EntryCollaboratorSearchvalue={users}onChange={setUsers}excluded={existingCollaborators}/><div className="flex justify-end space-x-2">- <NodeCollaboratorRoleDropdown+ <EntryCollaboratorRoleDropdownvalue={role}onChange={setRole}canEdit={true}@@ -49,8 +49,8 @@ export const NodeCollaboratorCreate = ({mutate({input: {- type: 'node_collaborator_create',- nodeId,+ type: 'entry_collaborator_create',+ entryId,collaboratorIds: users.map((user) => user.id),role: role,userId: workspace.userId,diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-role-dropdown.tsxsimilarity index 90%rename from apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsxrename to apps/desktop/src/renderer/components/collaborators/entry-collaborator-role-dropdown.tsxindex 0ce56eda..39e7c222 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx+++ b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-role-dropdown.tsx@@ -7,14 +7,14 @@ import {DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-interface NodeCollaboratorRole {+interface EntryCollaboratorRole {name: string;value: string;description: string;enabled: boolean;}-const roles: NodeCollaboratorRole[] = [+const roles: EntryCollaboratorRole[] = [{name: 'Admin',value: 'admin',@@ -41,17 +41,17 @@ const roles: NodeCollaboratorRole[] = [},];-interface NodeCollaboratorRoleDropdownProps {+interface EntryCollaboratorRoleDropdownProps {value: string;onChange: (value: string) => void;canEdit: boolean;}-export const NodeCollaboratorRoleDropdown = ({+export const EntryCollaboratorRoleDropdown = ({value,onChange,canEdit,-}: NodeCollaboratorRoleDropdownProps) => {+}: EntryCollaboratorRoleDropdownProps) => {const currentRole = roles.find((role) => role.value === value);if (!canEdit) {diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-search.tsxsimilarity index 96%rename from apps/desktop/src/renderer/components/collaborators/node-collaborator-search.tsxrename to apps/desktop/src/renderer/components/collaborators/entry-collaborator-search.tsxindex 126b3b2e..206474c4 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx+++ b/apps/desktop/src/renderer/components/collaborators/entry-collaborator-search.tsx@@ -21,17 +21,17 @@ import {import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-interface NodeCollaboratorSearchProps {+interface EntryCollaboratorSearchProps {excluded: string[];value: User[];onChange: (value: User[]) => void;}-export const NodeCollaboratorSearch = ({+export const EntryCollaboratorSearch = ({excluded,value,onChange,-}: NodeCollaboratorSearchProps) => {+}: EntryCollaboratorSearchProps) => {const workspace = useWorkspace();const [query, setQuery] = React.useState('');diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx b/apps/desktop/src/renderer/components/collaborators/entry-collaborator.tsxsimilarity index 79%rename from apps/desktop/src/renderer/components/collaborators/node-collaborator.tsxrename to apps/desktop/src/renderer/components/collaborators/entry-collaborator.tsxindex 725db1d1..94ae109f 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx+++ b/apps/desktop/src/renderer/components/collaborators/entry-collaborator.tsx@@ -1,28 +1,28 @@-import { NodeRole } from '@colanode/core';+import { EntryRole } from '@colanode/core';import { Trash2 } from 'lucide-react';import { Avatar } from '@/renderer/components/avatars/avatar';-import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';+import { EntryCollaboratorRoleDropdown } from '@/renderer/components/collaborators/entry-collaborator-role-dropdown';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';import { useQuery } from '@/renderer/hooks/use-query';import { toast } from '@/renderer/hooks/use-toast';-interface NodeCollaboratorProps {- nodeId: string;+interface EntryCollaboratorProps {+ entryId: string;collaboratorId: string;- role: NodeRole;+ role: EntryRole;canEdit: boolean;canRemove: boolean;}-export const NodeCollaborator = ({- nodeId,+export const EntryCollaborator = ({+ entryId,collaboratorId,role,canEdit,canRemove,-}: NodeCollaboratorProps) => {+}: EntryCollaboratorProps) => {const workspace = useWorkspace();const { mutate } = useMutation();@@ -46,14 +46,14 @@ export const NodeCollaborator = ({</div></div><div className="flex flex-row items-center gap-1">- <NodeCollaboratorRoleDropdown+ <EntryCollaboratorRoleDropdownvalue={role}canEdit={canEdit}onChange={(newRole) => {mutate({input: {- type: 'node_collaborator_update',- nodeId: nodeId,+ type: 'entry_collaborator_update',+ entryId: entryId,collaboratorId: collaboratorId,role: newRole,userId: workspace.userId,@@ -74,8 +74,8 @@ export const NodeCollaborator = ({onClick={() => {mutate({input: {- type: 'node_collaborator_delete',- nodeId: nodeId,+ type: 'entry_collaborator_delete',+ entryId: entryId,collaboratorId: collaboratorId,userId: workspace.userId,},diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx b/apps/desktop/src/renderer/components/collaborators/entry-collaborators-popover.tsxsimilarity index 51%rename from apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsxrename to apps/desktop/src/renderer/components/collaborators/entry-collaborators-popover.tsxindex 3e570c35..dfa2753d 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx+++ b/apps/desktop/src/renderer/components/collaborators/entry-collaborators-popover.tsx@@ -1,31 +1,31 @@-import { Node, NodeRole } from '@colanode/core';+import { Entry, EntryRole } from '@colanode/core';import { UserRoundPlus } from 'lucide-react';-import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';+import { EntryCollaborators } from '@/renderer/components/collaborators/entry-collaborators';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-interface NodeCollaboratorsPopoverProps {- nodeId: string;- nodes: Node[];- role: NodeRole;+interface EntryCollaboratorsPopoverProps {+ entryId: string;+ entries: Entry[];+ role: EntryRole;}-export const NodeCollaboratorsPopover = ({- nodeId,- nodes,+export const EntryCollaboratorsPopover = ({+ entryId,+ entries,role,-}: NodeCollaboratorsPopoverProps) => {+}: EntryCollaboratorsPopoverProps) => {return (<Popover><PopoverTrigger asChild><UserRoundPlus className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" /></PopoverTrigger><PopoverContent className="mr-2 max-h-128 w-128 overflow-auto">- <NodeCollaborators nodeId={nodeId} nodes={nodes} role={role} />+ <EntryCollaborators entryId={entryId} entries={entries} role={role} /></PopoverContent></Popover>);diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx b/apps/desktop/src/renderer/components/collaborators/entry-collaborators.tsxsimilarity index 74%rename from apps/desktop/src/renderer/components/collaborators/node-collaborators.tsxrename to apps/desktop/src/renderer/components/collaborators/entry-collaborators.tsxindex f317c271..d878d416 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx+++ b/apps/desktop/src/renderer/components/collaborators/entry-collaborators.tsx@@ -1,44 +1,44 @@import {- extractNodeName,hasAdminAccess,- Node,- NodeRole,+ Entry,+ EntryRole,+ extractEntryName,} from '@colanode/core';import React from 'react';-import { NodeCollaborator } from '@/renderer/components/collaborators/node-collaborator';-import { NodeCollaboratorCreate } from '@/renderer/components/collaborators/node-collaborator-create';+import { EntryCollaborator } from '@/renderer/components/collaborators/entry-collaborator';+import { EntryCollaboratorCreate } from '@/renderer/components/collaborators/entry-collaborator-create';import { Separator } from '@/renderer/components/ui/separator';-import { buildNodeCollaborators } from '@/shared/lib/nodes';+import { buildEntryCollaborators } from '@/shared/lib/entries';-interface NodeCollaboratorsProps {- nodeId: string;- nodes: Node[];- role: NodeRole;+interface EntryCollaboratorsProps {+ entryId: string;+ entries: Entry[];+ role: EntryRole;}-export const NodeCollaborators = ({- nodeId,- nodes,+export const EntryCollaborators = ({+ entryId,+ entries,role,-}: NodeCollaboratorsProps) => {- const collaborators = buildNodeCollaborators(nodes);+}: EntryCollaboratorsProps) => {+ const collaborators = buildEntryCollaborators(entries);const directCollaborators = collaborators.filter(- (collaborator) => collaborator.nodeId === nodeId+ (collaborator) => collaborator.entryId === entryId);const directCollaboratorIds = directCollaborators.map((collaborator) => collaborator.collaboratorId);const isAdmin = hasAdminAccess(role);- const ancestors = nodes.filter((node) => node.id !== nodeId);+ const ancestors = entries.filter((entry) => entry.id !== entryId);return (<div className="flex flex-col gap-2">{isAdmin && (<React.Fragment>- <NodeCollaboratorCreate- nodeId={nodeId}+ <EntryCollaboratorCreate+ entryId={entryId}existingCollaborators={directCollaboratorIds}/><Separator />@@ -65,9 +65,9 @@ export const NodeCollaborators = ({}return (- <NodeCollaborator+ <EntryCollaboratorkey={collaborator.collaboratorId}- nodeId={nodeId}+ entryId={entryId}collaboratorId={collaborator.collaboratorId}role={collaborator.role}canEdit={canEdit}@@ -85,14 +85,14 @@ export const NodeCollaborators = ({</div>{ancestors.map((node) => {const inheritCollaborators = collaborators.filter(- (collaborator) => collaborator.nodeId === node.id+ (collaborator) => collaborator.entryId === entryId);if (inheritCollaborators.length === 0) {return null;}- const name = extractNodeName(node.attributes) ?? 'Unknown';+ const name = extractEntryName(node.attributes) ?? 'Unknown';return (<div key={node.id}><Separator className="my-3" />@@ -103,9 +103,9 @@ export const NodeCollaborators = ({const canEdit = isAdmin && collaborator.role !== 'admin';return (- <NodeCollaborator+ <EntryCollaboratorkey={collaborator.collaboratorId}- nodeId={nodeId}+ entryId={entryId}collaboratorId={collaborator.collaboratorId}role={collaborator.role}canEdit={canEdit}diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsxindex 586b990c..3d12cb7b 100644--- a/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx@@ -1,5 +1,5 @@import {- extractNodeRole,+ extractEntryRole,SelectFieldAttributes,SelectOptionAttributes,ViewFilterAttributes,@@ -40,7 +40,8 @@ export const BoardViewColumnRecords = ({return (<div className="mt-3 flex flex-col gap-2">{records.map((record) => {- const role = extractNodeRole(record, workspace.userId) ?? database.role;+ const role =+ extractEntryRole(record, workspace.userId) ?? database.role;return (<RecordProvider key={record.id} record={record} role={role}>diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsxindex 2b6c11a2..4568b5e8 100644--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx@@ -1,4 +1,4 @@-import { extractNodeRole, isSameDay,RecordNode } from '@colanode/core';+import { extractEntryRole, isSameDay, RecordEntry } from '@colanode/core';import { Plus } from 'lucide-react';import { CalendarViewRecordCard } from '@/renderer/components/databases/calendars/calendar-view-record-card';@@ -10,7 +10,7 @@ import { cn } from '@/shared/lib/utils';interface CalendarViewDayProps {date: Date;month: Date;- records: RecordNode[];+ records: RecordEntry[];onCreate?: () => void;}@@ -49,7 +49,8 @@ export const CalendarViewDay = ({</p></div>{records.map((record) => {- const role = extractNodeRole(record, workspace.userId) ?? database.role;+ const role =+ extractEntryRole(record, workspace.userId) ?? database.role;return (<RecordProvider key={record.id} record={record} role={role}>diff --git a/apps/desktop/src/renderer/components/databases/database-body.tsx b/apps/desktop/src/renderer/components/databases/database-body.tsxindex cbf1be0e..4a5e4b09 100644--- a/apps/desktop/src/renderer/components/databases/database-body.tsx+++ b/apps/desktop/src/renderer/components/databases/database-body.tsx@@ -1,4 +1,4 @@-import { DatabaseNode, NodeRole } from '@colanode/core';+import { DatabaseEntry, EntryRole } from '@colanode/core';import { useEffect } from 'react';import { Database } from '@/renderer/components/databases/database';@@ -7,8 +7,8 @@ import { useRadar } from '@/renderer/contexts/radar';import { useWorkspace } from '@/renderer/contexts/workspace';interface DatabaseBodyProps {- database: DatabaseNode;- role: NodeRole;+ database: DatabaseEntry;+ role: EntryRole;}export const DatabaseBody = ({ database, role }: DatabaseBodyProps) => {diff --git a/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsxindex eca9e365..ed63295f 100644--- a/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx@@ -1,23 +1,23 @@-import { DatabaseNode } from '@colanode/core';+import { DatabaseEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';interface DatabaseBreadcrumbItemProps {- node: DatabaseNode;+ database: DatabaseEntry;}export const DatabaseBreadcrumbItem = ({- node,+ database,}: DatabaseBreadcrumbItemProps) => {return (<div className="flex items-center space-x-2"><Avatarsize="small"- id={node.id}- name={node.attributes.name}- avatar={node.attributes.avatar}+ id={database.id}+ name={database.attributes.name}+ avatar={database.attributes.avatar}/>- <span>{node.attributes.name}</span>+ <span>{database.attributes.name}</span></div>);};diff --git a/apps/desktop/src/renderer/components/databases/database-container.tsx b/apps/desktop/src/renderer/components/databases/database-container.tsxindex 17b63511..dc5ec234 100644--- a/apps/desktop/src/renderer/components/databases/database-container.tsx+++ b/apps/desktop/src/renderer/components/databases/database-container.tsx@@ -1,4 +1,4 @@-import { extractNodeRole } from '@colanode/core';+import { extractEntryRole } from '@colanode/core';import { DatabaseBody } from '@/renderer/components/databases/database-body';import { DatabaseHeader } from '@/renderer/components/databases/database-header';@@ -6,14 +6,14 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface DatabaseContainerProps {- nodeId: string;+ databaseId: string;}-export const DatabaseContainer = ({ nodeId }: DatabaseContainerProps) => {+export const DatabaseContainer = ({ databaseId }: DatabaseContainerProps) => {const workspace = useWorkspace();const { data, isPending } = useQuery({- type: 'node_tree_get',- nodeId,+ type: 'entry_tree_get',+ entryId: databaseId,userId: workspace.userId,});@@ -21,9 +21,9 @@ export const DatabaseContainer = ({ nodeId }: DatabaseContainerProps) => {return null;}- const nodes = data ?? [];- const database = nodes.find((node) => node.id === nodeId);- const role = extractNodeRole(nodes, workspace.userId);+ const entries = data ?? [];+ const database = entries.find((entry) => entry.id === databaseId);+ const role = extractEntryRole(entries, workspace.userId);if (!database || database.type !== 'database' || !role) {return null;@@ -31,7 +31,7 @@ export const DatabaseContainer = ({ nodeId }: DatabaseContainerProps) => {return (<div className="flex h-full w-full flex-col">- <DatabaseHeader nodes={nodes} database={database} role={role} />+ <DatabaseHeader entries={entries} database={database} role={role} /><DatabaseBody database={database} role={role} /></div>);diff --git a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsxindex 21321ba4..d4440cb0 100644--- a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx@@ -15,11 +15,11 @@ import { toast } from '@/renderer/hooks/use-toast';interface DatabaseDeleteDialogProps {open: boolean;onOpenChange: (open: boolean) => void;- nodeId: string;+ entryId: string;}export const DatabaseDeleteDialog = ({- nodeId,+ entryId,open,onOpenChange,}: DatabaseDeleteDialogProps) => {@@ -47,12 +47,12 @@ export const DatabaseDeleteDialog = ({mutate({input: {type: 'database_delete',- databaseId: nodeId,+ databaseId: entryId,userId: workspace.userId,},onSuccess() {onOpenChange(false);- workspace.closeNode(nodeId);+ workspace.closeEntry(entryId);},onError(error) {toast({diff --git a/apps/desktop/src/renderer/components/databases/database-header.tsx b/apps/desktop/src/renderer/components/databases/database-header.tsxindex 15adc5d8..75ca8d95 100644--- a/apps/desktop/src/renderer/components/databases/database-header.tsx+++ b/apps/desktop/src/renderer/components/databases/database-header.tsx@@ -1,20 +1,19 @@-import { DatabaseNode, Node, NodeRole } from '@colanode/core';+import { DatabaseEntry, Entry, EntryRole } from '@colanode/core';-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { DatabaseSettings } from '@/renderer/components/databases/database-settings';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';+import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';interface DatabaseHeaderProps {- nodes: Node[];- database: DatabaseNode;- role: NodeRole;+ entries: Entry[];+ database: DatabaseEntry;+ role: EntryRole;}export const DatabaseHeader = ({- nodes,+ entries,database,role,}: DatabaseHeaderProps) => {@@ -24,17 +23,12 @@ export const DatabaseHeader = ({<Header><div className="flex w-full items-center gap-2 px-4"><div className="flex-grow">- {container.mode === 'main' && <NodeBreadcrumb nodes={nodes} />}+ {container.mode === 'main' && <EntryBreadcrumb entries={entries} />}{container.mode === 'modal' && (- <NodeFullscreenButton nodeId={database.id} />+ <EntryFullscreenButton entryId={database.id} />)}</div><div className="flex items-center gap-2">- <NodeCollaboratorsPopover- nodeId={database.id}- nodes={nodes}- role={role}- /><DatabaseSettings database={database} role={role} /></div></div>diff --git a/apps/desktop/src/renderer/components/databases/database-settings.tsx b/apps/desktop/src/renderer/components/databases/database-settings.tsxindex 14028792..1f9066d7 100644--- a/apps/desktop/src/renderer/components/databases/database-settings.tsx+++ b/apps/desktop/src/renderer/components/databases/database-settings.tsx@@ -1,8 +1,8 @@-import { DatabaseNode, hasEditorAccess, NodeRole } from '@colanode/core';+import { DatabaseEntry, hasEditorAccess, EntryRole } from '@colanode/core';import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';import React from 'react';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';+import { EntryCollaboratorAudit } from '@/renderer/components/collaborators/entry-collaborator-audit';import { DatabaseDeleteDialog } from '@/renderer/components/databases/database-delete-dialog';import { DatabaseUpdateDialog } from '@/renderer/components/databases/database-update-dialog';import {@@ -15,8 +15,8 @@ import {} from '@/renderer/components/ui/dropdown-menu';interface DatabaseSettingsProps {- database: DatabaseNode;- role: NodeRole;+ database: DatabaseEntry;+ role: EntryRole;}export const DatabaseSettings = ({ database, role }: DatabaseSettingsProps) => {@@ -84,7 +84,7 @@ export const DatabaseSettings = ({ database, role }: DatabaseSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Created by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={database.createdBy}date={database.createdAt}/>@@ -94,7 +94,7 @@ export const DatabaseSettings = ({ database, role }: DatabaseSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Last updated by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={database.updatedBy}date={database.updatedAt}/>@@ -104,7 +104,7 @@ export const DatabaseSettings = ({ database, role }: DatabaseSettingsProps) => {</DropdownMenuContent></DropdownMenu><DatabaseDeleteDialog- nodeId={database.id}+ entryId={database.id}open={showDeleteDialog}onOpenChange={setShowDeleteModal}/>diff --git a/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx b/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsxindex a6f6a114..9db16c5f 100644--- a/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx+++ b/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx@@ -1,31 +1,31 @@-import { DatabaseNode } from '@colanode/core';+import { DatabaseEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { cn } from '@/shared/lib/utils';interface DatabaseSidebarItemProps {- node: DatabaseNode;+ database: DatabaseEntry;}-export const DatabaseSidebarItem = ({ node }: DatabaseSidebarItemProps) => {+export const DatabaseSidebarItem = ({ database }: DatabaseSidebarItemProps) => {const workspace = useWorkspace();- const isActive = workspace.isNodeActive(node.id);+ const isActive = workspace.isEntryActive(database.id);const isUnread = false;const mentionsCount = 0;return (<button- key={node.id}+ key={database.id}className={cn('flex w-full items-center',isActive && 'bg-sidebar-accent')}><Avatar- id={node.id}- avatar={node.attributes.avatar}- name={node.attributes.name}+ id={database.id}+ avatar={database.attributes.avatar}+ name={database.attributes.name}className="h-4 w-4"/><span@@ -34,7 +34,7 @@ export const DatabaseSidebarItem = ({ node }: DatabaseSidebarItemProps) => {isUnread && 'font-bold')}>- {node.attributes.name ?? 'Unnamed'}+ {database.attributes.name ?? 'Unnamed'}</span>{mentionsCount > 0 && (<span className="mr-1 rounded-md bg-sidebar-accent px-1 py-0.5 text-xs text-sidebar-accent-foreground">diff --git a/apps/desktop/src/renderer/components/databases/database-update-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-update-dialog.tsxindex a39613d1..de8ead46 100644--- a/apps/desktop/src/renderer/components/databases/database-update-dialog.tsx+++ b/apps/desktop/src/renderer/components/databases/database-update-dialog.tsx@@ -1,4 +1,4 @@-import { DatabaseNode, hasEditorAccess, NodeRole } from '@colanode/core';+import { DatabaseEntry, hasEditorAccess, EntryRole } from '@colanode/core';import { DatabaseForm } from '@/renderer/components/databases/database-form';import {@@ -13,8 +13,8 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface DatabaseUpdateDialogProps {- database: DatabaseNode;- role: NodeRole;+ database: DatabaseEntry;+ role: EntryRole;open: boolean;onOpenChange: (open: boolean) => void;}diff --git a/apps/desktop/src/renderer/components/databases/database.tsx b/apps/desktop/src/renderer/components/databases/database.tsxindex d4093352..423edf54 100644--- a/apps/desktop/src/renderer/components/databases/database.tsx+++ b/apps/desktop/src/renderer/components/databases/database.tsx@@ -1,8 +1,8 @@import {- DatabaseNode,+ DatabaseEntry,hasCollaboratorAccess,hasEditorAccess,- NodeRole,+ EntryRole,} from '@colanode/core';import React from 'react';@@ -12,8 +12,8 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface DatabaseProps {- database: DatabaseNode;- role: NodeRole;+ database: DatabaseEntry;+ role: EntryRole;children: React.ReactNode;}diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsxindex 9444413c..79376963 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx@@ -1,4 +1,4 @@-import { RecordNode } from '@colanode/core';+import { RecordEntry } from '@colanode/core';import isHotkey from 'is-hotkey';import { Maximize2 } from 'lucide-react';import React, { Fragment } from 'react';@@ -53,7 +53,7 @@ const NameEditor = ({ initialValue, onSave, onCancel }: NameEditorProps) => {};interface TableViewNameCellProps {- record: RecordNode;+ record: RecordEntry;}export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsxindex 565a2323..b902d473 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-row.tsx@@ -1,4 +1,4 @@-import { extractNodeRole, RecordNode } from '@colanode/core';+import { extractEntryRole, RecordEntry } from '@colanode/core';import { TableViewNameCell } from '@/renderer/components/databases/tables/table-view-name-cell';import { RecordFieldValue } from '@/renderer/components/records/record-field-value';@@ -9,14 +9,14 @@ import { useWorkspace } from '@/renderer/contexts/workspace';interface TableViewRowProps {index: number;- record: RecordNode;+ record: RecordEntry;}export const TableViewRow = ({ index, record }: TableViewRowProps) => {const workspace = useWorkspace();const database = useDatabase();const view = useView();- const role = extractNodeRole(record, workspace.userId) ?? database.role;+ const role = extractEntryRole(record, workspace.userId) ?? database.role;return (<RecordProvider record={record} role={role}>diff --git a/apps/desktop/src/renderer/components/documents/document.tsx b/apps/desktop/src/renderer/components/documents/document.tsxindex aed24bce..8d832344 100644--- a/apps/desktop/src/renderer/components/documents/document.tsx+++ b/apps/desktop/src/renderer/components/documents/document.tsx@@ -5,7 +5,7 @@ import { DocumentEditor } from '@/renderer/components/documents/document-editor'import { mapBlocksToContents } from '@/shared/lib/editor';interface DocumentProps {- nodeId: string;+ entryId: string;rootId: string;content?: Record<string, Block> | null;transactionId: string;@@ -15,7 +15,7 @@ interface DocumentProps {}export const Document = ({- nodeId,+ entryId,rootId,content,transactionId,@@ -23,8 +23,8 @@ export const Document = ({onUpdate,autoFocus,}: DocumentProps) => {- const nodeBlocks = Object.values(content ?? {});- const contents = mapBlocksToContents(nodeId, nodeBlocks);+ const entryBlocks = Object.values(content ?? {});+ const contents = mapBlocksToContents(entryId, entryBlocks);if (!contents.length) {contents.push({@@ -39,8 +39,8 @@ export const Document = ({return (<DocumentEditor- key={nodeId}- documentId={nodeId}+ key={entryId}+ documentId={entryId}rootId={rootId}content={tiptapContent}transactionId={transactionId}diff --git a/apps/desktop/src/renderer/components/files/file-container.tsx b/apps/desktop/src/renderer/components/files/file-container.tsxindex 69d32bb5..946eb325 100644--- a/apps/desktop/src/renderer/components/files/file-container.tsx+++ b/apps/desktop/src/renderer/components/files/file-container.tsx@@ -1,4 +1,4 @@-import { extractNodeRole } from '@colanode/core';+import { extractEntryRole } from '@colanode/core';import { FileBody } from '@/renderer/components/files/file-body';import { FileHeader } from '@/renderer/components/files/file-header';@@ -6,22 +6,22 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface FileContainerProps {- nodeId: string;+ fileId: string;}-export const FileContainer = ({ nodeId }: FileContainerProps) => {+export const FileContainer = ({ fileId }: FileContainerProps) => {const workspace = useWorkspace();const { data: file, isPending: isFilePending } = useQuery({type: 'file_get',- id: nodeId,+ id: fileId,userId: workspace.userId,});- const { data: nodes, isPending: isNodesPending } = useQuery(+ const { data: entries, isPending: isEntriesPending } = useQuery({- type: 'node_tree_get',- nodeId: file?.parentId ?? '',+ type: 'entry_tree_get',+ entryId: file?.parentId ?? '',userId: workspace.userId,},{@@ -29,18 +29,18 @@ export const FileContainer = ({ nodeId }: FileContainerProps) => {});- if (isFilePending || isNodesPending) {+ if (isFilePending || isEntriesPending) {return null;}- const role = extractNodeRole(nodes ?? [], workspace.userId);+ const role = extractEntryRole(entries ?? [], workspace.userId);if (!file || !role) {return null;}return (<div className="flex h-full w-full flex-col">- <FileHeader nodes={nodes ?? []} file={file} role={role} />+ <FileHeader entries={entries ?? []} file={file} role={role} /><FileBody file={file} /></div>);diff --git a/apps/desktop/src/renderer/components/files/file-context-menu.tsx b/apps/desktop/src/renderer/components/files/file-context-menu.tsxindex 5f8fc39e..f1943f20 100644--- a/apps/desktop/src/renderer/components/files/file-context-menu.tsx+++ b/apps/desktop/src/renderer/components/files/file-context-menu.tsx@@ -48,7 +48,7 @@ export const FileContextMenu = ({ id, children }: FileContextMenuProps) => {</ContextMenuContent></ContextMenu><FileDeleteDialog- nodeId={id}+ fileId={id}open={openDelete}onOpenChange={setOpenDelete}/>diff --git a/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx b/apps/desktop/src/renderer/components/files/file-delete-dialog.tsxindex 3e9e9066..e3d0fdad 100644--- a/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx@@ -13,13 +13,13 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface FileDeleteDialogProps {- nodeId: string;+ fileId: string;open: boolean;onOpenChange: (open: boolean) => void;}export const FileDeleteDialog = ({- nodeId,+ fileId,open,onOpenChange,}: FileDeleteDialogProps) => {@@ -47,7 +47,7 @@ export const FileDeleteDialog = ({mutate({input: {type: 'file_delete',- fileId: nodeId,+ fileId: fileId,userId: workspace.userId,},onSuccess() {diff --git a/apps/desktop/src/renderer/components/files/file-header.tsx b/apps/desktop/src/renderer/components/files/file-header.tsxindex 7f3075d7..548f5474 100644--- a/apps/desktop/src/renderer/components/files/file-header.tsx+++ b/apps/desktop/src/renderer/components/files/file-header.tsx@@ -1,38 +1,32 @@-import { Node, NodeRole } from '@colanode/core';+import { Entry, EntryRole } from '@colanode/core';-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { FileSettings } from '@/renderer/components/files/file-settings';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';+import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';import { FileWithState } from '@/shared/types/files';interface FileHeaderProps {- nodes: Node[];+ entries: Entry[];file: FileWithState;- role: NodeRole;+ role: EntryRole;}-export const FileHeader = ({ nodes, file, role }: FileHeaderProps) => {+export const FileHeader = ({ entries, file }: FileHeaderProps) => {const container = useContainer();return (<Header><div className="flex w-full items-center gap-2 px-4"><div className="flex-grow">- {container.mode === 'main' && <NodeBreadcrumb nodes={nodes} />}+ {container.mode === 'main' && <EntryBreadcrumb entries={entries} />}{container.mode === 'modal' && (- <NodeFullscreenButton nodeId={file.id} />+ <EntryFullscreenButton entryId={file.id} />)}</div><div className="flex items-center gap-2">- <NodeCollaboratorsPopover- nodeId={file.id}- nodes={nodes}- role={role}- />- <FileSettings nodeId={file.id} />+ <FileSettings fileId={file.id} /></div></div></Header>diff --git a/apps/desktop/src/renderer/components/files/file-settings.tsx b/apps/desktop/src/renderer/components/files/file-settings.tsxindex 52697224..13f8621f 100644--- a/apps/desktop/src/renderer/components/files/file-settings.tsx+++ b/apps/desktop/src/renderer/components/files/file-settings.tsx@@ -10,10 +10,10 @@ import {} from '@/renderer/components/ui/dropdown-menu';interface FileSettingsProps {- nodeId: string;+ fileId: string;}-export const FileSettings = ({ nodeId }: FileSettingsProps) => {+export const FileSettings = ({ fileId }: FileSettingsProps) => {const [showDeleteModal, setShowDeleteModal] = React.useState(false);return (<React.Fragment>@@ -38,7 +38,7 @@ export const FileSettings = ({ nodeId }: FileSettingsProps) => {</DropdownMenuContent></DropdownMenu><FileDeleteDialog- nodeId={nodeId}+ fileId={fileId}open={showDeleteModal}onOpenChange={setShowDeleteModal}/>diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsxindex f122bd3d..f50023ca 100644--- a/apps/desktop/src/renderer/components/folders/folder-body.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx@@ -1,4 +1,4 @@-import { FolderNode } from '@colanode/core';+import { FolderEntry } from '@colanode/core';import {Check,Filter,@@ -56,7 +56,7 @@ export const folderLayouts: FolderLayout[] = [];interface FolderBodyProps {- folder: FolderNode;+ folder: FolderEntry;}export const FolderBody = ({ folder }: FolderBodyProps) => {@@ -103,6 +103,7 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {userId: workspace.userId,filePath,parentId: folder.id,+ entryId: folder.id,rootId: folder.rootId,},onError(error) {diff --git a/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsxindex 05658d27..0280c4a7 100644--- a/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx@@ -1,21 +1,21 @@-import { FolderNode } from '@colanode/core';+import { FolderEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';interface FolderBreadcrumbItemProps {- node: FolderNode;+ folder: FolderEntry;}-export const FolderBreadcrumbItem = ({ node }: FolderBreadcrumbItemProps) => {+export const FolderBreadcrumbItem = ({ folder }: FolderBreadcrumbItemProps) => {return (<div className="flex items-center space-x-2"><Avatarsize="small"- id={node.id}- name={node.attributes.name}- avatar={node.attributes.avatar}+ id={folder.id}+ name={folder.attributes.name}+ avatar={folder.attributes.avatar}/>- <span>{node.attributes.name}</span>+ <span>{folder.attributes.name}</span></div>);};diff --git a/apps/desktop/src/renderer/components/folders/folder-container.tsx b/apps/desktop/src/renderer/components/folders/folder-container.tsxindex 84449200..859eb69d 100644--- a/apps/desktop/src/renderer/components/folders/folder-container.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-container.tsx@@ -1,4 +1,4 @@-import { extractNodeRole } from '@colanode/core';+import { extractEntryRole } from '@colanode/core';import { FolderBody } from '@/renderer/components/folders/folder-body';import { FolderHeader } from '@/renderer/components/folders/folder-header';@@ -6,15 +6,15 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface FolderContainerProps {- nodeId: string;+ folderId: string;}-export const FolderContainer = ({ nodeId }: FolderContainerProps) => {+export const FolderContainer = ({ folderId }: FolderContainerProps) => {const workspace = useWorkspace();const { data, isPending } = useQuery({- type: 'node_tree_get',- nodeId,+ type: 'entry_tree_get',+ entryId: folderId,userId: workspace.userId,});@@ -22,9 +22,9 @@ export const FolderContainer = ({ nodeId }: FolderContainerProps) => {return null;}- const nodes = data ?? [];- const folder = nodes.find((node) => node.id === nodeId);- const role = extractNodeRole(nodes, workspace.userId);+ const entries = data ?? [];+ const folder = entries.find((entry) => entry.id === folderId);+ const role = extractEntryRole(entries, workspace.userId);if (!folder || folder.type !== 'folder' || !role) {return null;@@ -32,7 +32,7 @@ export const FolderContainer = ({ nodeId }: FolderContainerProps) => {return (<div className="flex h-full w-full flex-col">- <FolderHeader nodes={nodes} folder={folder} role={role} />+ <FolderHeader entries={entries} folder={folder} role={role} /><FolderBody folder={folder} /></div>);diff --git a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsxindex 17fb7657..14d0437c 100644--- a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx@@ -15,11 +15,11 @@ import { toast } from '@/renderer/hooks/use-toast';interface FolderDeleteDialogProps {open: boolean;onOpenChange: (open: boolean) => void;- nodeId: string;+ entryId: string;}export const FolderDeleteDialog = ({- nodeId,+ entryId,open,onOpenChange,}: FolderDeleteDialogProps) => {@@ -47,12 +47,12 @@ export const FolderDeleteDialog = ({mutate({input: {type: 'folder_delete',- folderId: nodeId,+ folderId: entryId,userId: workspace.userId,},onSuccess() {onOpenChange(false);- workspace.closeNode(nodeId);+ workspace.closeEntry(entryId);},onError(error) {toast({diff --git a/apps/desktop/src/renderer/components/folders/folder-header.tsx b/apps/desktop/src/renderer/components/folders/folder-header.tsxindex 607dd3eb..bc4cc018 100644--- a/apps/desktop/src/renderer/components/folders/folder-header.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-header.tsx@@ -1,36 +1,30 @@-import { FolderNode, Node, NodeRole } from '@colanode/core';+import { FolderEntry, Entry, EntryRole } from '@colanode/core';-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { FolderSettings } from '@/renderer/components/folders/folder-settings';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';+import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';interface FolderHeaderProps {- nodes: Node[];- folder: FolderNode;- role: NodeRole;+ entries: Entry[];+ folder: FolderEntry;+ role: EntryRole;}-export const FolderHeader = ({ nodes, folder, role }: FolderHeaderProps) => {+export const FolderHeader = ({ entries, folder, role }: FolderHeaderProps) => {const container = useContainer();return (<Header><div className="flex w-full items-center gap-2 px-4"><div className="flex-grow">- <NodeBreadcrumb nodes={nodes} />+ <EntryBreadcrumb entries={entries} />{container.mode === 'modal' && (- <NodeFullscreenButton nodeId={folder.id} />+ <EntryFullscreenButton entryId={folder.id} />)}</div><div className="flex items-center gap-2">- <NodeCollaboratorsPopover- nodeId={folder.id}- nodes={nodes}- role={role}- /><FolderSettings folder={folder} role={role} /></div></div>diff --git a/apps/desktop/src/renderer/components/folders/folder-settings.tsx b/apps/desktop/src/renderer/components/folders/folder-settings.tsxindex a8dd4791..56a6cf51 100644--- a/apps/desktop/src/renderer/components/folders/folder-settings.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-settings.tsx@@ -1,8 +1,8 @@-import { FolderNode, hasEditorAccess, NodeRole } from '@colanode/core';+import { FolderEntry, hasEditorAccess, EntryRole } from '@colanode/core';import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';import React from 'react';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';+import { EntryCollaboratorAudit } from '@/renderer/components/collaborators/entry-collaborator-audit';import { FolderDeleteDialog } from '@/renderer/components/folders/folder-delete-dialog';import { FolderUpdateDialog } from '@/renderer/components/folders/folder-update-dialog';import {@@ -15,8 +15,8 @@ import {} from '@/renderer/components/ui/dropdown-menu';interface FolderSettingsProps {- folder: FolderNode;- role: NodeRole;+ folder: FolderEntry;+ role: EntryRole;}export const FolderSettings = ({ folder, role }: FolderSettingsProps) => {@@ -84,7 +84,7 @@ export const FolderSettings = ({ folder, role }: FolderSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Created by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={folder.createdBy}date={folder.createdAt}/>@@ -94,7 +94,7 @@ export const FolderSettings = ({ folder, role }: FolderSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Last updated by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={folder.updatedBy}date={folder.updatedAt}/>@@ -104,7 +104,7 @@ export const FolderSettings = ({ folder, role }: FolderSettingsProps) => {</DropdownMenuContent></DropdownMenu><FolderDeleteDialog- nodeId={folder.id}+ entryId={folder.id}open={showDeleteDialog}onOpenChange={setShowDeleteModal}/>diff --git a/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx b/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsxindex 6f0dedc6..a8fd4403 100644--- a/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx@@ -1,31 +1,31 @@-import { FolderNode } from '@colanode/core';+import { FolderEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { cn } from '@/shared/lib/utils';interface FolderSidebarItemProps {- node: FolderNode;+ folder: FolderEntry;}-export const FolderSidebarItem = ({ node }: FolderSidebarItemProps) => {+export const FolderSidebarItem = ({ folder }: FolderSidebarItemProps) => {const workspace = useWorkspace();- const isActive = workspace.isNodeActive(node.id);+ const isActive = workspace.isEntryActive(folder.id);const isUnread = false;const mentionsCount = 0;return (<button- key={node.id}+ key={folder.id}className={cn('flex w-full items-center',isActive && 'bg-sidebar-accent')}><Avatar- id={node.id}- avatar={node.attributes.avatar}- name={node.attributes.name}+ id={folder.id}+ avatar={folder.attributes.avatar}+ name={folder.attributes.name}className="h-4 w-4"/><span@@ -34,7 +34,7 @@ export const FolderSidebarItem = ({ node }: FolderSidebarItemProps) => {isUnread && 'font-bold')}>- {node.attributes.name ?? 'Unnamed'}+ {folder.attributes.name ?? 'Unnamed'}</span>{mentionsCount > 0 && (<span className="mr-1 rounded-md bg-sidebar-accent px-1 py-0.5 text-xs text-sidebar-accent-foreground">diff --git a/apps/desktop/src/renderer/components/folders/folder-update-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-update-dialog.tsxindex 73ab24c7..cfdae575 100644--- a/apps/desktop/src/renderer/components/folders/folder-update-dialog.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-update-dialog.tsx@@ -1,4 +1,4 @@-import { FolderNode, hasEditorAccess, NodeRole } from '@colanode/core';+import { FolderEntry, hasEditorAccess, EntryRole } from '@colanode/core';import { FolderForm } from '@/renderer/components/folders/folder-form';import {@@ -13,8 +13,8 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface FolderUpdateDialogProps {- folder: FolderNode;- role: NodeRole;+ folder: FolderEntry;+ role: EntryRole;open: boolean;onOpenChange: (open: boolean) => void;}diff --git a/apps/desktop/src/renderer/components/layouts/node-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/layouts/entry-breadcrumb-item.tsxsimilarity index 59%rename from apps/desktop/src/renderer/components/layouts/node-breadcrumb-item.tsxrename to apps/desktop/src/renderer/components/layouts/entry-breadcrumb-item.tsxindex 0e71803c..b2e4bc00 100644--- a/apps/desktop/src/renderer/components/layouts/node-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/layouts/entry-breadcrumb-item.tsx@@ -1,4 +1,4 @@-import { Node } from '@colanode/core';+import { Entry } from '@colanode/core';import { ChannelBreadcrumbItem } from '@/renderer/components/channels/channel-breadcrumb-item';import { ChatBreadcrumbItem } from '@/renderer/components/chats/chat-breadcrumb-item';@@ -8,26 +8,26 @@ import { PageBreadcrumbItem } from '@/renderer/components/pages/page-breadcrumb-import { RecordBreadcrumbItem } from '@/renderer/components/records/record-breadcrumb-item';import { SpaceBreadcrumbItem } from '@/renderer/components/spaces/space-breadcrumb-item';-interface NodeBreadcrumbItemProps {- node: Node;+interface EntryBreadcrumbItemProps {+ entry: Entry;}-export const NodeBreadcrumbItem = ({ node }: NodeBreadcrumbItemProps) => {- switch (node.type) {+export const EntryBreadcrumbItem = ({ entry }: EntryBreadcrumbItemProps) => {+ switch (entry.type) {case 'space':- return <SpaceBreadcrumbItem node={node} />;+ return <SpaceBreadcrumbItem space={entry} />;case 'channel':- return <ChannelBreadcrumbItem node={node} />;+ return <ChannelBreadcrumbItem channel={entry} />;case 'chat':- return <ChatBreadcrumbItem node={node} />;+ return <ChatBreadcrumbItem chat={entry} />;case 'page':- return <PageBreadcrumbItem node={node} />;+ return <PageBreadcrumbItem page={entry} />;case 'database':- return <DatabaseBreadcrumbItem node={node} />;+ return <DatabaseBreadcrumbItem database={entry} />;case 'record':- return <RecordBreadcrumbItem node={node} />;+ return <RecordBreadcrumbItem record={entry} />;case 'folder':- return <FolderBreadcrumbItem node={node} />;+ return <FolderBreadcrumbItem folder={entry} />;default:return null;}diff --git a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx b/apps/desktop/src/renderer/components/layouts/entry-breadcrumb.tsxsimilarity index 59%rename from apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsxrename to apps/desktop/src/renderer/components/layouts/entry-breadcrumb.tsxindex db275ea2..b4a284ad 100644--- a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx+++ b/apps/desktop/src/renderer/components/layouts/entry-breadcrumb.tsx@@ -1,7 +1,7 @@-import { Node, NodeTypes } from '@colanode/core';+import { Entry, EntryType } from '@colanode/core';import React from 'react';-import { NodeBreadcrumbItem } from '@/renderer/components/layouts/node-breadcrumb-item';+import { EntryBreadcrumbItem } from '@/renderer/components/layouts/entry-breadcrumb-item';import {Breadcrumb,BreadcrumbEllipsis,@@ -17,52 +17,53 @@ import {} from '@/renderer/components/ui/dropdown-menu';import { useWorkspace } from '@/renderer/contexts/workspace';-interface NodeBreadcrumbProps {- nodes: Node[];+interface EntryBreadcrumbProps {+ entries: Entry[];}-const isClickable = (type: string) =>- type !== NodeTypes.Space && type !== NodeTypes.Message;+const isClickable = (type: EntryType) => type !== 'space';-export const NodeBreadcrumb = ({ nodes }: NodeBreadcrumbProps) => {+export const EntryBreadcrumb = ({ entries }: EntryBreadcrumbProps) => {const workspace = useWorkspace();// Show ellipsis if we have more than 3 nodes (first + last two)- const showEllipsis = nodes.length > 3;+ const showEllipsis = entries.length > 3;- // Get visible nodes: first node + last two nodes- const visibleNodes = showEllipsis ? [nodes[0], ...nodes.slice(-2)] : nodes;+ // Get visible entries: first entry + last two entries+ const visibleEntries = showEllipsis+ ? [entries[0], ...entries.slice(-2)]+ : entries;- // Get middle nodes for ellipsis (everything except first and last two)- const ellipsisNodes = showEllipsis ? nodes.slice(1, -2) : [];+ // Get middle entries for ellipsis (everything except first and last two)+ const ellipsisEntries = showEllipsis ? entries.slice(1, -2) : [];return (<Breadcrumb><BreadcrumbList>- {visibleNodes.map((node, index) => {- if (!node) {+ {visibleEntries.map((entry, index) => {+ if (!entry) {return null;}const isFirst = index === 0;- const isClickableNode = isClickable(node.type);+ const isClickableEntry = isClickable(entry.type);return (- <React.Fragment key={node.id}>+ <React.Fragment key={entry.id}>{!isFirst && <BreadcrumbSeparator />}<BreadcrumbItemclassName={- isClickableNode+ isClickableEntry? 'hover:cursor-pointer hover:text-foreground': ''}onClick={() => {- if (isClickableNode) {- workspace.openInMain(node.id);+ if (isClickableEntry) {+ workspace.openInMain(entry.id);}}}>- <NodeBreadcrumbItem node={node} />+ <EntryBreadcrumbItem entry={entry} /></BreadcrumbItem>{showEllipsis && isFirst && (<React.Fragment>@@ -73,28 +74,28 @@ export const NodeBreadcrumb = ({ nodes }: NodeBreadcrumbProps) => {<BreadcrumbEllipsis className="h-4 w-4" /></DropdownMenuTrigger><DropdownMenuContent align="start">- {ellipsisNodes.map((ellipsisNode) => {- const isClickableEllipsisNode = isClickable(- ellipsisNode.type+ {ellipsisEntries.map((ellipsisEntry) => {+ const isClickableEllipsisEntry = isClickable(+ ellipsisEntry.type);return (<DropdownMenuItem- key={ellipsisNode.id}- disabled={!isClickableEllipsisNode}+ key={ellipsisEntry.id}+ disabled={!isClickableEllipsisEntry}onClick={() => {- if (isClickableEllipsisNode) {- workspace.openInMain(ellipsisNode.id);+ if (isClickableEllipsisEntry) {+ workspace.openInMain(ellipsisEntry.id);}}}><BreadcrumbItemclassName={- isClickableEllipsisNode+ isClickableEllipsisEntry? 'hover:cursor-pointer hover:text-foreground': ''}>- <NodeBreadcrumbItem node={ellipsisNode} />+ <EntryBreadcrumbItem entry={ellipsisEntry} /></BreadcrumbItem></DropdownMenuItem>);diff --git a/apps/desktop/src/renderer/components/layouts/node-container.tsx b/apps/desktop/src/renderer/components/layouts/entry-container.tsxsimilarity index 61%rename from apps/desktop/src/renderer/components/layouts/node-container.tsxrename to apps/desktop/src/renderer/components/layouts/entry-container.tsxindex 7a6c729a..fdc3611c 100644--- a/apps/desktop/src/renderer/components/layouts/node-container.tsx+++ b/apps/desktop/src/renderer/components/layouts/entry-container.tsx@@ -8,28 +8,28 @@ import { FolderContainer } from '@/renderer/components/folders/folder-container'import { PageContainer } from '@/renderer/components/pages/page-container';import { RecordContainer } from '@/renderer/components/records/record-container';-interface NodeContainerProps {- nodeId: string;+interface EntryContainerProps {+ entryId: string;}-export const NodeContainer = ({ nodeId }: NodeContainerProps) => {- const idType = getIdType(nodeId);+export const EntryContainer = ({ entryId }: EntryContainerProps) => {+ const idType = getIdType(entryId);switch (idType) {case IdType.Channel:- return <ChannelContainer nodeId={nodeId} />;+ return <ChannelContainer channelId={entryId} />;case IdType.Page:- return <PageContainer nodeId={nodeId} />;+ return <PageContainer pageId={entryId} />;case IdType.Database:- return <DatabaseContainer nodeId={nodeId} />;+ return <DatabaseContainer databaseId={entryId} />;case IdType.Record:- return <RecordContainer nodeId={nodeId} />;+ return <RecordContainer recordId={entryId} />;case IdType.Chat:- return <ChatContainer nodeId={nodeId} />;+ return <ChatContainer chatId={entryId} />;case IdType.Folder:- return <FolderContainer nodeId={nodeId} />;+ return <FolderContainer folderId={entryId} />;case IdType.File:- return <FileContainer nodeId={nodeId} />;+ return <FileContainer fileId={entryId} />;default:return null;}diff --git a/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx b/apps/desktop/src/renderer/components/layouts/entry-fullscreen-button.tsxsimilarity index 62%rename from apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsxrename to apps/desktop/src/renderer/components/layouts/entry-fullscreen-button.tsxindex 88f94b4c..783453b2 100644--- a/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx+++ b/apps/desktop/src/renderer/components/layouts/entry-fullscreen-button.tsx@@ -2,18 +2,20 @@ import { Fullscreen } from 'lucide-react';import { useWorkspace } from '@/renderer/contexts/workspace';-interface NodeFullscreenButtonProps {- nodeId: string;+interface EntryFullscreenButtonProps {+ entryId: string;}-export const NodeFullscreenButton = ({ nodeId }: NodeFullscreenButtonProps) => {+export const EntryFullscreenButton = ({+ entryId,+}: EntryFullscreenButtonProps) => {const workspace = useWorkspace();return (<FullscreenclassName="size-5 cursor-pointer text-muted-foreground hover:text-foreground"onClick={() => {- workspace.openInMain(nodeId);+ workspace.openInMain(entryId);}}/>);diff --git a/apps/desktop/src/renderer/components/layouts/node-sidebar-item.tsx b/apps/desktop/src/renderer/components/layouts/entry-sidebar-item.tsxsimilarity index 57%rename from apps/desktop/src/renderer/components/layouts/node-sidebar-item.tsxrename to apps/desktop/src/renderer/components/layouts/entry-sidebar-item.tsxindex 05bc04bf..b4d81d4f 100644--- a/apps/desktop/src/renderer/components/layouts/node-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/layouts/entry-sidebar-item.tsx@@ -1,4 +1,4 @@-import { Node } from '@colanode/core';+import { Entry } from '@colanode/core';import React from 'react';import { ChannelSidebarItem } from '@/renderer/components/channels/channel-sidebar-item';@@ -8,26 +8,26 @@ import { FolderSidebarItem } from '@/renderer/components/folders/folder-sidebar-import { PageSidebarItem } from '@/renderer/components/pages/page-sidebar-item';import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';-interface NodeSidebarItemProps {- node: Node;+interface EntrySidebarItemProps {+ entry: Entry;}-export const NodeSidebarItem = ({- node,-}: NodeSidebarItemProps): React.ReactNode => {- switch (node.type) {+export const EntrySidebarItem = ({+ entry,+}: EntrySidebarItemProps): React.ReactNode => {+ switch (entry.type) {case 'space':- return <SpaceSidebarItem node={node} />;+ return <SpaceSidebarItem space={entry} />;case 'channel':- return <ChannelSidebarItem node={node} />;+ return <ChannelSidebarItem channel={entry} />;case 'chat':- return <ChatSidebarItem node={node} />;+ return <ChatSidebarItem chat={entry} />;case 'page':- return <PageSidebarItem node={node} />;+ return <PageSidebarItem page={entry} />;case 'database':- return <DatabaseSidebarItem node={node} />;+ return <DatabaseSidebarItem database={entry} />;case 'folder':- return <FolderSidebarItem node={node} />;+ return <FolderSidebarItem folder={entry} />;default:return null;}diff --git a/apps/desktop/src/renderer/components/layouts/layout-main.tsx b/apps/desktop/src/renderer/components/layouts/layout-main.tsxindex d800c479..7dc5cb1c 100644--- a/apps/desktop/src/renderer/components/layouts/layout-main.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-main.tsx@@ -1,14 +1,14 @@-import { NodeContainer } from '@/renderer/components/layouts/node-container';+import { EntryContainer } from '@/renderer/components/layouts/entry-container';import { ContainerContext } from '@/renderer/contexts/container';interface LayoutMainProps {- nodeId: string;+ entryId: string;}-export const LayoutMain = ({ nodeId }: LayoutMainProps) => {+export const LayoutMain = ({ entryId }: LayoutMainProps) => {return (- <ContainerContext.Provider value={{ nodeId, mode: 'main' }}>- <NodeContainer nodeId={nodeId} />+ <ContainerContext.Provider value={{ entryId, mode: 'main' }}>+ <EntryContainer entryId={entryId} /></ContainerContext.Provider>);};diff --git a/apps/desktop/src/renderer/components/layouts/layout-modal.tsx b/apps/desktop/src/renderer/components/layouts/layout-modal.tsxindex 83e16d0f..a56c357d 100644--- a/apps/desktop/src/renderer/components/layouts/layout-modal.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-modal.tsx@@ -1,7 +1,7 @@import { VisuallyHidden } from '@radix-ui/react-visually-hidden';import React from 'react';-import { NodeContainer } from '@/renderer/components/layouts/node-container';+import { EntryContainer } from '@/renderer/components/layouts/entry-container';import {Dialog,DialogContent,@@ -11,10 +11,10 @@ import { ContainerContext } from '@/renderer/contexts/container';import { useWorkspace } from '@/renderer/contexts/workspace';interface LayoutModalProps {- nodeId: string;+ entryId: string;}-export const LayoutModal = ({ nodeId }: LayoutModalProps) => {+export const LayoutModal = ({ entryId }: LayoutModalProps) => {const workspace = useWorkspace();const [open, setOpen] = React.useState(true);@@ -38,8 +38,8 @@ export const LayoutModal = ({ nodeId }: LayoutModalProps) => {<VisuallyHidden><DialogTitle>Modal</DialogTitle></VisuallyHidden>- <ContainerContext.Provider value={{ nodeId, mode: 'modal' }}>- <NodeContainer nodeId={nodeId} />+ <ContainerContext.Provider value={{ entryId, mode: 'modal' }}>+ <EntryContainer entryId={entryId} /></ContainerContext.Provider></DialogContent></Dialog>diff --git a/apps/desktop/src/renderer/components/layouts/layout-right.tsx b/apps/desktop/src/renderer/components/layouts/layout-right.tsxindex 95289003..81f5d712 100644--- a/apps/desktop/src/renderer/components/layouts/layout-right.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-right.tsx@@ -1,14 +1,14 @@-import { NodeContainer } from '@/renderer/components/layouts/node-container';+import { EntryContainer } from '@/renderer/components/layouts/entry-container';import { ContainerContext } from '@/renderer/contexts/container';interface LayoutRightProps {- nodeId: string;+ entryId: string;}-export const LayoutRight = ({ nodeId }: LayoutRightProps) => {+export const LayoutRight = ({ entryId }: LayoutRightProps) => {return (- <ContainerContext.Provider value={{ nodeId, mode: 'panel' }}>- <NodeContainer nodeId={nodeId} />+ <ContainerContext.Provider value={{ entryId, mode: 'panel' }}>+ <EntryContainer entryId={entryId} /></ContainerContext.Provider>);};diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsxindex 89350870..acbb6f04 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx@@ -1,4 +1,4 @@-import { ChatNode } from '@colanode/core';+import { ChatEntry } from '@colanode/core';import { ChatCreatePopover } from '@/renderer/components/chats/chat-create-popover';import { ChatSidebarItem } from '@/renderer/components/chats/chat-sidebar-item';@@ -10,13 +10,13 @@ export const LayoutSidebarChats = () => {const workspace = useWorkspace();const { data } = useQuery({- type: 'node_children_get',+ type: 'entry_children_get',userId: workspace.userId,- nodeId: workspace.id,+ entryId: workspace.id,types: ['chat'],});- const chats = data?.map((node) => node as ChatNode) ?? [];+ const chats = data?.map((entry) => entry as ChatEntry) ?? [];return (<div className="group/sidebar-chats flex w-full min-w-0 flex-col p-2">@@ -34,14 +34,14 @@ export const LayoutSidebarChats = () => {key={item.id}className={cn('px-2 flex w-full items-center gap-2 overflow-hidden rounded-md text-left text-sm hover:bg-sidebar-accent hover:text-sidebar-accent-foreground h-7',- workspace.isNodeActive(item.id) &&+ workspace.isEntryActive(item.id) &&'bg-sidebar-accent text-sidebar-accent-foreground font-medium')}onClick={() => {workspace.openInMain(item.id);}}>- <ChatSidebarItem node={item} />+ <ChatSidebarItem chat={item} /></button>))}</div>diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsxindex e9f70a95..4846ca6a 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx@@ -1,4 +1,4 @@-import { SpaceNode } from '@colanode/core';+import { SpaceEntry } from '@colanode/core';import { SpaceCreateButton } from '@/renderer/components/spaces/space-create-button';import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';@@ -11,13 +11,13 @@ export const LayoutSidebarSpaces = () => {workspace.role !== 'guest' && workspace.role !== 'none';const { data } = useQuery({- type: 'node_children_get',+ type: 'entry_children_get',userId: workspace.userId,- nodeId: workspace.id,+ entryId: workspace.id,types: ['space'],});- const spaces = data?.map((node) => node as SpaceNode) ?? [];+ const spaces = data?.map((entry) => entry as SpaceEntry) ?? [];return (<div className="group/sidebar-spaces flex w-full min-w-0 flex-col p-2">@@ -34,7 +34,7 @@ export const LayoutSidebarSpaces = () => {<div className="flex w-full min-w-0 flex-col gap-1">{spaces.map((space) => (- <SpaceSidebarItem node={space} key={space.id} />+ <SpaceSidebarItem space={space} key={space.id} />))}</div></div>diff --git a/apps/desktop/src/renderer/components/layouts/layout.tsx b/apps/desktop/src/renderer/components/layouts/layout.tsxindex 9f1af63f..d576e5f8 100644--- a/apps/desktop/src/renderer/components/layouts/layout.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout.tsx@@ -12,9 +12,9 @@ export const Layout = ({ main, modal }: LayoutProps) => {<div className="w-screen min-w-screen h-screen min-h-screen flex flex-row"><LayoutSidebar /><main className="h-full max-h-screen w-full min-w-128 flex-grow overflow-hidden bg-white">- {main && <LayoutMain nodeId={main} />}+ {main && <LayoutMain entryId={main} />}</main>- {modal && <LayoutModal nodeId={modal} />}+ {modal && <LayoutModal entryId={modal} />}</div>);};diff --git a/apps/desktop/src/renderer/components/messages/conversation.tsx b/apps/desktop/src/renderer/components/messages/conversation.tsxindex 3be0f878..fa78cbe1 100644--- a/apps/desktop/src/renderer/components/messages/conversation.tsx+++ b/apps/desktop/src/renderer/components/messages/conversation.tsx@@ -1,7 +1,7 @@import {hasAdminAccess,hasCollaboratorAccess,- NodeRole,+ EntryRole,} from '@colanode/core';import React from 'react';import { InView } from 'react-intersection-observer';@@ -18,7 +18,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';interface ConversationProps {conversationId: string;rootId: string;- role: NodeRole;+ role: EntryRole;}export const Conversation = ({diff --git a/apps/desktop/src/renderer/components/pages/page-body.tsx b/apps/desktop/src/renderer/components/pages/page-body.tsxindex 330c361d..3a7c62a6 100644--- a/apps/desktop/src/renderer/components/pages/page-body.tsx+++ b/apps/desktop/src/renderer/components/pages/page-body.tsx@@ -1,5 +1,5 @@import { useCallback, useEffect } from 'react';-import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';+import { hasEditorAccess, EntryRole, PageEntry } from '@colanode/core';import { JSONContent } from '@tiptap/core';import { Document } from '@/renderer/components/documents/document';@@ -10,8 +10,8 @@ import { toast } from '@/renderer/hooks/use-toast';import { useRadar } from '@/renderer/contexts/radar';interface PageBodyProps {- page: PageNode;- role: NodeRole;+ page: PageEntry;+ role: EntryRole;}export const PageBody = ({ page, role }: PageBodyProps) => {@@ -64,7 +64,7 @@ export const PageBody = ({ page, role }: PageBodyProps) => {return (<ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12"><Document- nodeId={page.id}+ entryId={page.id}rootId={page.rootId}content={page.attributes.content}transactionId={page.transactionId}diff --git a/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsxindex f16cdc01..fc2d4268 100644--- a/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx@@ -1,21 +1,21 @@-import { PageNode } from '@colanode/core';+import { PageEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';interface PageBreadcrumbItemProps {- node: PageNode;+ page: PageEntry;}-export const PageBreadcrumbItem = ({ node }: PageBreadcrumbItemProps) => {+export const PageBreadcrumbItem = ({ page }: PageBreadcrumbItemProps) => {return (<div className="flex items-center space-x-2"><Avatarsize="small"- id={node.id}- name={node.attributes.name}- avatar={node.attributes.avatar}+ id={page.id}+ name={page.attributes.name}+ avatar={page.attributes.avatar}/>- <span>{node.attributes.name}</span>+ <span>{page.attributes.name}</span></div>);};diff --git a/apps/desktop/src/renderer/components/pages/page-container.tsx b/apps/desktop/src/renderer/components/pages/page-container.tsxindex 6c08db3b..49954544 100644--- a/apps/desktop/src/renderer/components/pages/page-container.tsx+++ b/apps/desktop/src/renderer/components/pages/page-container.tsx@@ -1,4 +1,4 @@-import { extractNodeRole } from '@colanode/core';+import { extractEntryRole } from '@colanode/core';import { PageBody } from '@/renderer/components/pages/page-body';import { PageHeader } from '@/renderer/components/pages/page-header';@@ -6,14 +6,14 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface PageContainerProps {- nodeId: string;+ pageId: string;}-export const PageContainer = ({ nodeId }: PageContainerProps) => {+export const PageContainer = ({ pageId }: PageContainerProps) => {const workspace = useWorkspace();const { data, isPending } = useQuery({- type: 'node_tree_get',- nodeId,+ type: 'entry_tree_get',+ entryId: pageId,userId: workspace.userId,});@@ -21,9 +21,9 @@ export const PageContainer = ({ nodeId }: PageContainerProps) => {return null;}- const nodes = data ?? [];- const page = nodes.find((node) => node.id === nodeId);- const role = extractNodeRole(nodes, workspace.userId);+ const entries = data ?? [];+ const page = entries.find((entry) => entry.id === pageId);+ const role = extractEntryRole(entries, workspace.userId);if (!page || page.type !== 'page' || !role) {return null;@@ -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} />+ <PageHeader entries={entries} page={page} role={role} /><PageBody page={page} role={role} /></div>);diff --git a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsxindex 89918b77..69aa9997 100644--- a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx@@ -15,11 +15,11 @@ import { toast } from '@/renderer/hooks/use-toast';interface PageDeleteDialogProps {open: boolean;onOpenChange: (open: boolean) => void;- nodeId: string;+ pageId: string;}export const PageDeleteDialog = ({- nodeId,+ pageId,open,onOpenChange,}: PageDeleteDialogProps) => {@@ -47,12 +47,12 @@ export const PageDeleteDialog = ({mutate({input: {type: 'page_delete',- pageId: nodeId,+ pageId,userId: workspace.userId,},onSuccess() {onOpenChange(false);- workspace.closeNode(nodeId);+ workspace.closeEntry(pageId);},onError(error) {toast({diff --git a/apps/desktop/src/renderer/components/pages/page-header.tsx b/apps/desktop/src/renderer/components/pages/page-header.tsxindex c72237e2..f2eb8c16 100644--- a/apps/desktop/src/renderer/components/pages/page-header.tsx+++ b/apps/desktop/src/renderer/components/pages/page-header.tsx@@ -1,36 +1,30 @@-import { Node, NodeRole,PageNode } from '@colanode/core';+import { Entry, EntryRole, PageEntry } from '@colanode/core';-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';+import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';import { PageSettings } from '@/renderer/components/pages/page-settings';import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';interface PageHeaderProps {- nodes: Node[];- page: PageNode;- role: NodeRole;+ entries: Entry[];+ page: PageEntry;+ role: EntryRole;}-export const PageHeader = ({ nodes, page, role }: PageHeaderProps) => {+export const PageHeader = ({ entries, page, role }: PageHeaderProps) => {const container = useContainer();return (<Header><div className="flex w-full items-center gap-2 px-4"><div className="flex-grow">- <NodeBreadcrumb nodes={nodes} />+ <EntryBreadcrumb entries={entries} />{container.mode === 'modal' && (- <NodeFullscreenButton nodeId={page.id} />+ <EntryFullscreenButton entryId={page.id} />)}</div><div className="flex items-center gap-2">- <NodeCollaboratorsPopover- nodeId={page.id}- nodes={nodes}- role={role}- /><PageSettings page={page} role={role} /></div></div>diff --git a/apps/desktop/src/renderer/components/pages/page-settings.tsx b/apps/desktop/src/renderer/components/pages/page-settings.tsxindex 2ea74cbc..8a94a42b 100644--- a/apps/desktop/src/renderer/components/pages/page-settings.tsx+++ b/apps/desktop/src/renderer/components/pages/page-settings.tsx@@ -1,8 +1,8 @@-import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';+import { hasEditorAccess, EntryRole, PageEntry } from '@colanode/core';import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';import React from 'react';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';+import { EntryCollaboratorAudit } from '@/renderer/components/collaborators/entry-collaborator-audit';import { PageDeleteDialog } from '@/renderer/components/pages/page-delete-dialog';import { PageUpdateDialog } from '@/renderer/components/pages/page-update-dialog';import {@@ -15,8 +15,8 @@ import {} from '@/renderer/components/ui/dropdown-menu';interface PageSettingsProps {- page: PageNode;- role: NodeRole;+ page: PageEntry;+ role: EntryRole;}export const PageSettings = ({ page, role }: PageSettingsProps) => {@@ -84,7 +84,7 @@ export const PageSettings = ({ page, role }: PageSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Created by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={page.createdBy}date={page.createdAt}/>@@ -94,7 +94,7 @@ export const PageSettings = ({ page, role }: PageSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Last updated by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={page.updatedBy}date={page.updatedAt}/>@@ -104,7 +104,7 @@ export const PageSettings = ({ page, role }: PageSettingsProps) => {</DropdownMenuContent></DropdownMenu><PageDeleteDialog- nodeId={page.id}+ pageId={page.id}open={showDeleteDialog}onOpenChange={setShowDeleteModal}/>diff --git a/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx b/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsxindex 87f6fb60..21a85cfe 100644--- a/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx@@ -1,31 +1,31 @@-import { PageNode } from '@colanode/core';+import { PageEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { cn } from '@/shared/lib/utils';interface PageSidebarItemProps {- node: PageNode;+ page: PageEntry;}-export const PageSidebarItem = ({ node }: PageSidebarItemProps) => {+export const PageSidebarItem = ({ page }: PageSidebarItemProps) => {const workspace = useWorkspace();- const isActive = workspace.isNodeActive(node.id);+ const isActive = workspace.isEntryActive(page.id);const isUnread = false;const mentionsCount = 0;return (<button- key={node.id}+ key={page.id}className={cn('flex w-full items-center',isActive && 'bg-sidebar-accent')}><Avatar- id={node.id}- avatar={node.attributes.avatar}- name={node.attributes.name}+ id={page.id}+ avatar={page.attributes.avatar}+ name={page.attributes.name}className="h-4 w-4"/><span@@ -34,7 +34,7 @@ export const PageSidebarItem = ({ node }: PageSidebarItemProps) => {isUnread && 'font-bold')}>- {node.attributes.name ?? 'Unnamed'}+ {page.attributes.name ?? 'Unnamed'}</span>{mentionsCount > 0 && (<span className="mr-1 rounded-md bg-sidebar-accent px-1 py-0.5 text-xs text-sidebar-accent-foreground">diff --git a/apps/desktop/src/renderer/components/pages/page-update-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-update-dialog.tsxindex 5aca6f8b..10b3b45e 100644--- a/apps/desktop/src/renderer/components/pages/page-update-dialog.tsx+++ b/apps/desktop/src/renderer/components/pages/page-update-dialog.tsx@@ -1,4 +1,4 @@-import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';+import { hasEditorAccess, EntryRole, PageEntry } from '@colanode/core';import { PageForm } from '@/renderer/components/pages/page-form';import {@@ -13,8 +13,8 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface PageUpdateDialogProps {- page: PageNode;- role: NodeRole;+ page: PageEntry;+ role: EntryRole;open: boolean;onOpenChange: (open: boolean) => void;}diff --git a/apps/desktop/src/renderer/components/records/record-body.tsx b/apps/desktop/src/renderer/components/records/record-body.tsxindex 9fcb3376..51c69754 100644--- a/apps/desktop/src/renderer/components/records/record-body.tsx+++ b/apps/desktop/src/renderer/components/records/record-body.tsx@@ -1,8 +1,8 @@import {- DatabaseNode,+ DatabaseEntry,hasEditorAccess,- NodeRole,- RecordNode,+ EntryRole,+ RecordEntry,} from '@colanode/core';import { JSONContent } from '@tiptap/core';import { useCallback, useEffect } from 'react';@@ -19,10 +19,10 @@ import { toast } from '@/renderer/hooks/use-toast';import { useRadar } from '@/renderer/contexts/radar';interface RecordBodyProps {- record: RecordNode;- recordRole: NodeRole;- database: DatabaseNode;- databaseRole: NodeRole;+ record: RecordEntry;+ recordRole: EntryRole;+ database: DatabaseEntry;+ databaseRole: EntryRole;}export const RecordBody = ({@@ -87,7 +87,7 @@ export const RecordBody = ({</RecordProvider><Separator className="my-4 w-full" /><Document- nodeId={record.id}+ entryId={record.id}rootId={record.rootId}content={record.attributes.content}transactionId={record.transactionId}diff --git a/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsxindex 76f77791..6840d50d 100644--- a/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx@@ -1,21 +1,21 @@-import { RecordNode } from '@colanode/core';+import { RecordEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';interface RecordBreadcrumbItemProps {- node: RecordNode;+ record: RecordEntry;}-export const RecordBreadcrumbItem = ({ node }: RecordBreadcrumbItemProps) => {+export const RecordBreadcrumbItem = ({ record }: RecordBreadcrumbItemProps) => {return (<div className="flex items-center space-x-2"><Avatarsize="small"- id={node.id}- name={node.attributes.name}- avatar={node.attributes.avatar}+ id={record.id}+ name={record.attributes.name}+ avatar={record.attributes.avatar}/>- <span>{node.attributes.name}</span>+ <span>{record.attributes.name}</span></div>);};diff --git a/apps/desktop/src/renderer/components/records/record-container.tsx b/apps/desktop/src/renderer/components/records/record-container.tsxindex 03e4b60f..0e3d28eb 100644--- a/apps/desktop/src/renderer/components/records/record-container.tsx+++ b/apps/desktop/src/renderer/components/records/record-container.tsx@@ -1,4 +1,4 @@-import { extractNodeRole } from '@colanode/core';+import { extractEntryRole } from '@colanode/core';import { RecordBody } from '@/renderer/components/records/record-body';import { RecordHeader } from '@/renderer/components/records/record-header';@@ -6,14 +6,14 @@ import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';interface RecordContainerProps {- nodeId: string;+ recordId: string;}-export const RecordContainer = ({ nodeId }: RecordContainerProps) => {+export const RecordContainer = ({ recordId }: RecordContainerProps) => {const workspace = useWorkspace();const { data, isPending } = useQuery({- type: 'node_tree_get',- nodeId,+ type: 'entry_tree_get',+ entryId: recordId,userId: workspace.userId,});@@ -21,28 +21,28 @@ export const RecordContainer = ({ nodeId }: RecordContainerProps) => {return null;}- const nodes = data ?? [];- const record = nodes.find((node) => node.id === nodeId);+ const entries = data ?? [];+ const record = entries.find((entry) => entry.id === recordId);if (!record || record.type !== 'record') {return null;}- const databaseIndex = nodes.findIndex(- (node) => node.id === record.attributes.databaseId+ const databaseIndex = entries.findIndex(+ (entry) => entry.id === record.attributes.databaseId);if (databaseIndex === -1) {return null;}- const database = nodes[databaseIndex];+ const database = entries[databaseIndex];if (!database || database.type !== 'database') {return null;}- const databaseAncestors = nodes.slice(0, databaseIndex);+ const databaseAncestors = entries.slice(0, databaseIndex);- const recordRole = extractNodeRole(nodes, workspace.userId);- const databaseRole = extractNodeRole(+ const recordRole = extractEntryRole(entries, workspace.userId);+ const databaseRole = extractEntryRole([...databaseAncestors, database],workspace.userId);@@ -53,7 +53,7 @@ export const RecordContainer = ({ nodeId }: RecordContainerProps) => {return (<div className="flex h-full w-full flex-col">- <RecordHeader nodes={nodes} record={record} role={recordRole} />+ <RecordHeader entries={entries} record={record} role={recordRole} /><RecordBodyrecord={record}recordRole={recordRole}diff --git a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsxindex 65410691..dafb5cd2 100644--- a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx@@ -15,11 +15,11 @@ import { toast } from '@/renderer/hooks/use-toast';interface RecordDeleteDialogProps {open: boolean;onOpenChange: (open: boolean) => void;- nodeId: string;+ entryId: string;}export const RecordDeleteDialog = ({- nodeId,+ entryId,open,onOpenChange,}: RecordDeleteDialogProps) => {@@ -47,12 +47,12 @@ export const RecordDeleteDialog = ({mutate({input: {type: 'record_delete',- recordId: nodeId,+ recordId: entryId,userId: workspace.userId,},onSuccess() {onOpenChange(false);- workspace.closeNode(nodeId);+ workspace.closeEntry(entryId);},onError(error) {toast({diff --git a/apps/desktop/src/renderer/components/records/record-header.tsx b/apps/desktop/src/renderer/components/records/record-header.tsxindex 57fff471..66acf95c 100644--- a/apps/desktop/src/renderer/components/records/record-header.tsx+++ b/apps/desktop/src/renderer/components/records/record-header.tsx@@ -1,36 +1,30 @@-import { Node, NodeRole,RecordNode } from '@colanode/core';+import { Entry, EntryRole, RecordEntry } from '@colanode/core';-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';+import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';import { RecordSettings } from '@/renderer/components/records/record-settings';import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';interface RecordHeaderProps {- nodes: Node[];- record: RecordNode;- role: NodeRole;+ entries: Entry[];+ record: RecordEntry;+ role: EntryRole;}-export const RecordHeader = ({ nodes, record, role }: RecordHeaderProps) => {+export const RecordHeader = ({ entries, record, role }: RecordHeaderProps) => {const container = useContainer();return (<Header><div className="flex w-full items-center gap-2 px-4"><div className="flex-grow">- {container.mode === 'main' && <NodeBreadcrumb nodes={nodes} />}+ {container.mode === 'main' && <EntryBreadcrumb entries={entries} />}{container.mode === 'modal' && (- <NodeFullscreenButton nodeId={record.id} />+ <EntryFullscreenButton entryId={record.id} />)}</div><div className="flex items-center gap-2">- <NodeCollaboratorsPopover- nodeId={record.id}- nodes={nodes}- role={role}- /><RecordSettings record={record} role={role} /></div></div>diff --git a/apps/desktop/src/renderer/components/records/record-provider.tsx b/apps/desktop/src/renderer/components/records/record-provider.tsxindex d352f310..5f0ace4e 100644--- a/apps/desktop/src/renderer/components/records/record-provider.tsx+++ b/apps/desktop/src/renderer/components/records/record-provider.tsx@@ -1,4 +1,4 @@-import { hasEditorAccess, NodeRole, RecordNode } from '@colanode/core';+import { hasEditorAccess, EntryRole, RecordEntry } from '@colanode/core';import React from 'react';import { RecordContext } from '@/renderer/contexts/record';@@ -11,8 +11,8 @@ export const RecordProvider = ({role,children,}: {- record: RecordNode;- role: NodeRole;+ record: RecordEntry;+ role: EntryRole;children: React.ReactNode;}) => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/records/record-search.tsx b/apps/desktop/src/renderer/components/records/record-search.tsxindex 4d26f549..12f9f056 100644--- a/apps/desktop/src/renderer/components/records/record-search.tsx+++ b/apps/desktop/src/renderer/components/records/record-search.tsx@@ -1,4 +1,4 @@-import { RecordNode } from '@colanode/core';+import { RecordEntry } from '@colanode/core';import React from 'react';import { Avatar } from '@/renderer/components/avatars/avatar';@@ -15,7 +15,7 @@ import { useQuery } from '@/renderer/hooks/use-query';interface RecordSearchProps {exclude?: string[];- onSelect: (record: RecordNode) => void;+ onSelect: (record: RecordEntry) => void;databaseId: string;}diff --git a/apps/desktop/src/renderer/components/records/record-settings.tsx b/apps/desktop/src/renderer/components/records/record-settings.tsxindex f2550220..29083323 100644--- a/apps/desktop/src/renderer/components/records/record-settings.tsx+++ b/apps/desktop/src/renderer/components/records/record-settings.tsx@@ -1,8 +1,8 @@-import { hasEditorAccess, NodeRole, RecordNode } from '@colanode/core';+import { hasEditorAccess, EntryRole, RecordEntry } from '@colanode/core';import { Copy, Settings, Trash2 } from 'lucide-react';import React from 'react';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';+import { EntryCollaboratorAudit } from '@/renderer/components/collaborators/entry-collaborator-audit';import { RecordDeleteDialog } from '@/renderer/components/records/record-delete-dialog';import {DropdownMenu,@@ -15,8 +15,8 @@ import {import { useWorkspace } from '@/renderer/contexts/workspace';interface RecordSettingsProps {- record: RecordNode;- role: NodeRole;+ record: RecordEntry;+ role: EntryRole;}export const RecordSettings = ({ record, role }: RecordSettingsProps) => {@@ -55,7 +55,7 @@ export const RecordSettings = ({ record, role }: RecordSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Created by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={record.createdBy}date={record.createdAt}/>@@ -65,7 +65,7 @@ export const RecordSettings = ({ record, role }: RecordSettingsProps) => {<DropdownMenuSeparator /><DropdownMenuLabel>Last updated by</DropdownMenuLabel><DropdownMenuItem>- <NodeCollaboratorAudit+ <EntryCollaboratorAuditcollaboratorId={record.updatedBy}date={record.updatedAt}/>@@ -75,7 +75,7 @@ export const RecordSettings = ({ record, role }: RecordSettingsProps) => {</DropdownMenuContent></DropdownMenu><RecordDeleteDialog- nodeId={record.id}+ entryId={record.id}open={showDeleteDialog}onOpenChange={setShowDeleteModal}/>diff --git a/apps/desktop/src/renderer/components/records/values/record-relation-value.tsx b/apps/desktop/src/renderer/components/records/values/record-relation-value.tsxindex 4823caf8..b18b4b40 100644--- a/apps/desktop/src/renderer/components/records/values/record-relation-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-relation-value.tsx@@ -1,4 +1,4 @@-import { RecordNode, RelationFieldAttributes } from '@colanode/core';+import { RecordEntry, RelationFieldAttributes } from '@colanode/core';import { X } from 'lucide-react';import React from 'react';@@ -21,7 +21,7 @@ interface RecordRelationValueProps {readOnly?: boolean;}-const RelationBadge = ({ record }: { record: RecordNode }) => {+const RelationBadge = ({ record }: { record: RecordEntry }) => {const name = record.attributes.name ?? 'Unnamed';return (<div className="flex flex-row items-center gap-1">@@ -48,13 +48,13 @@ export const RecordRelationValue = ({const relationIds = record.getRelationValue(field) ?? [];const results = useQueries(relationIds.map((id) => ({- type: 'node_get',- nodeId: id,+ type: 'entry_get',+ entryId: id,userId: workspace.userId,})));- const relations: RecordNode[] = [];+ const relations: RecordEntry[] = [];for (const result of results) {if (result.data && result.data.type === 'record') {relations.push(result.data);diff --git a/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsxindex a2d21b7e..7cb7c330 100644--- a/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx@@ -1,21 +1,21 @@-import { SpaceNode } from '@colanode/core';+import { SpaceEntry } from '@colanode/core';import { Avatar } from '@/renderer/components/avatars/avatar';interface SpaceBreadcrumbItemProps {- node: SpaceNode;+ space: SpaceEntry;}-export const SpaceBreadcrumbItem = ({ node }: SpaceBreadcrumbItemProps) => {+export const SpaceBreadcrumbItem = ({ space }: SpaceBreadcrumbItemProps) => {return (<div className="flex items-center space-x-2"><Avatarsize="small"- id={node.id}- name={node.attributes.name}- avatar={node.attributes.avatar}+ id={space.id}+ name={space.attributes.name}+ avatar={space.attributes.avatar}/>- <span>{node.attributes.name}</span>+ <span>{space.attributes.name}</span></div>);};diff --git a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsxindex a60e4b57..1a6b889f 100644--- a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx@@ -1,9 +1,9 @@-import { extractNodeRole, hasAdminAccess, SpaceNode } from '@colanode/core';+import { extractEntryRole, hasAdminAccess, SpaceEntry } from '@colanode/core';import { VisuallyHidden } from '@radix-ui/react-visually-hidden';import { Info, Trash2, Users } from 'lucide-react';import { Avatar } from '@/renderer/components/avatars/avatar';-import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';+import { EntryCollaborators } from '@/renderer/components/collaborators/entry-collaborators';import { SpaceDeleteForm } from '@/renderer/components/spaces/space-delete-form';import { SpaceUpdateForm } from '@/renderer/components/spaces/space-update-form';import {@@ -20,7 +20,7 @@ import {import { useWorkspace } from '@/renderer/contexts/workspace';interface SpaceSettingsDialogProps {- space: SpaceNode;+ space: SpaceEntry;open: boolean;onOpenChange: (open: boolean) => void;defaultTab?: string;@@ -33,7 +33,7 @@ export const SpaceSettingsDialog = ({defaultTab,}: SpaceSettingsDialogProps) => {const workspace = useWorkspace();- const role = extractNodeRole(space, workspace.userId);+ const role = extractEntryRole(space, workspace.userId);if (!role) {return null;}@@ -102,9 +102,9 @@ export const SpaceSettingsDialog = ({className="focus-visible:ring-0 focus-visible:ring-offset-0"value="collaborators">- <NodeCollaborators- nodeId={space.id}- nodes={[space]}+ <EntryCollaborators+ entryId={space.id}+ entries={[space]}role={role}/></TabsContent>diff --git a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsxindex 6fb3f232..99f02f2f 100644--- a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx@@ -1,4 +1,4 @@-import { compareString, SpaceNode } from '@colanode/core';+import { compareString, SpaceEntry } from '@colanode/core';import {ChevronRight,Database,@@ -15,7 +15,7 @@ import { Avatar } from '@/renderer/components/avatars/avatar';import { ChannelCreateDialog } from '@/renderer/components/channels/channel-create-dialog';import { DatabaseCreateDialog } from '@/renderer/components/databases/database-create-dialog';import { FolderCreateDialog } from '@/renderer/components/folders/folder-create-dialog';-import { NodeSidebarItem } from '@/renderer/components/layouts/node-sidebar-item';+import { EntrySidebarItem } from '@/renderer/components/layouts/entry-sidebar-item';import { PageCreateDialog } from '@/renderer/components/pages/page-create-dialog';import { SpaceSettingsDialog } from '@/renderer/components/spaces/space-settings-dialog';import {@@ -41,15 +41,15 @@ interface SettingsState {}interface SpaceSidebarItemProps {- node: SpaceNode;+ space: SpaceEntry;}-export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {+export const SpaceSidebarItem = ({ space }: SpaceSidebarItemProps) => {const workspace = useWorkspace();const { data } = useQuery({- type: 'node_children_get',- nodeId: node.id,+ type: 'entry_children_get',+ entryId: space.id,userId: workspace.userId,types: ['page', 'channel', 'database', 'folder'],});@@ -67,7 +67,7 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {return (<React.Fragment><Collapsible- key={node.id}+ key={space.id}asChilddefaultOpen={true}className="group/sidebar-space"@@ -77,13 +77,13 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {<CollapsibleTrigger asChild><button className="group/space-button flex items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm flex-1"><Avatar- id={node.id}- avatar={node.attributes.avatar}- name={node.attributes.name}+ id={space.id}+ avatar={space.attributes.avatar}+ name={space.attributes.name}className="size-4 group-hover/space-button:hidden"/><ChevronRight className="hidden size-4 transition-transform duration-200 group-hover/space-button:block group-data-[state=open]/sidebar-space:rotate-90" />- <span>{node.attributes.name}</span>+ <span>{space.attributes.name}</span></button></CollapsibleTrigger><DropdownMenu>@@ -94,7 +94,7 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {</DropdownMenuTrigger><DropdownMenuContent className="ml-1 w-72"><DropdownMenuLabel>- {node.attributes.name ?? 'Unnamed'}+ {space.attributes.name ?? 'Unnamed'}</DropdownMenuLabel><DropdownMenuSeparator /><DropdownMenuItem onSelect={() => setOpenCreatePage(true)}>@@ -159,11 +159,11 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {<divclassName={cn('text-sm flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',- workspace.isNodeActive(child.id) &&+ workspace.isEntryActive(child.id) &&'bg-sidebar-accent text-sidebar-accent-foreground font-medium')}>- <NodeSidebarItem node={child} />+ <EntrySidebarItem entry={child} /></div></li>))}@@ -173,35 +173,35 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {</Collapsible>{openCreateChannel && (<ChannelCreateDialog- spaceId={node.id}+ spaceId={space.id}open={openCreateChannel}onOpenChange={setOpenCreateChannel}/>)}{openCreatePage && (<PageCreateDialog- spaceId={node.id}+ spaceId={space.id}open={openCreatePage}onOpenChange={setOpenCreatePage}/>)}{openCreateDatabase && (<DatabaseCreateDialog- spaceId={node.id}+ spaceId={space.id}open={openCreateDatabase}onOpenChange={setOpenCreateDatabase}/>)}{openCreateFolder && (<FolderCreateDialog- spaceId={node.id}+ spaceId={space.id}open={openCreateFolder}onOpenChange={setOpenCreateFolder}/>)}{settingsState.open && (<SpaceSettingsDialog- space={node}+ space={space}open={settingsState.open}onOpenChange={(open) =>setSettingsState({ open, tab: settingsState.tab })diff --git a/apps/desktop/src/renderer/components/spaces/space-update-form.tsx b/apps/desktop/src/renderer/components/spaces/space-update-form.tsxindex 6e8dbf4b..20ae5092 100644--- a/apps/desktop/src/renderer/components/spaces/space-update-form.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-update-form.tsx@@ -1,4 +1,4 @@-import { SpaceNode } from '@colanode/core';+import { SpaceEntry } from '@colanode/core';import { zodResolver } from '@hookform/resolvers/zod';import { useForm } from 'react-hook-form';import * as z from 'zod';@@ -22,7 +22,7 @@ import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface SpaceUpdateFormProps {- space: SpaceNode;+ space: SpaceEntry;}const formSchema = z.object({diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsxindex 633ff463..e263ee22 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx@@ -33,16 +33,16 @@ export const Workspace = () => {<WorkspaceContext.Providervalue={{...workspace,- openInMain(nodeId) {+ openInMain(entryId) {setSearchParams((prev) => {- prev.set('main', nodeId);- if (nodeId === modal) {+ prev.set('main', entryId);+ if (entryId === modal) {prev.delete('modal');}return prev;});},- isNodeActive(id) {+ isEntryActive(id) {return id === main;},isModalActive(id) {@@ -66,7 +66,7 @@ export const Workspace = () => {return prev;});},- closeNode(id) {+ closeEntry(id) {if (id === main) {setSearchParams((prev) => {prev.delete('main');diff --git a/apps/desktop/src/renderer/contexts/container.ts b/apps/desktop/src/renderer/contexts/container.tsindex edc92af2..9ef8514d 100644--- a/apps/desktop/src/renderer/contexts/container.ts+++ b/apps/desktop/src/renderer/contexts/container.ts@@ -1,7 +1,7 @@import { createContext, useContext } from 'react';interface ContainerContext {- nodeId: string;+ entryId: string;mode: 'main' | 'modal' | 'panel';}diff --git a/apps/desktop/src/renderer/contexts/conversation.ts b/apps/desktop/src/renderer/contexts/conversation.tsindex 0ab55291..326717c8 100644--- a/apps/desktop/src/renderer/contexts/conversation.ts+++ b/apps/desktop/src/renderer/contexts/conversation.ts@@ -1,4 +1,4 @@-import { NodeRole } from '@colanode/core';+import { EntryRole } from '@colanode/core';import { createContext, useContext } from 'react';import { MessageNode } from '@/shared/types/messages';@@ -6,7 +6,7 @@ import { MessageNode } from '@/shared/types/messages';interface ConversationContext {id: string;rootId: string;- role: NodeRole;+ role: EntryRole;canCreateMessage: boolean;onReply: (message: MessageNode) => void;onLastMessageIdChange: (id: string) => void;diff --git a/apps/desktop/src/renderer/contexts/database.ts b/apps/desktop/src/renderer/contexts/database.tsindex c4b5ffaa..4ddde445 100644--- a/apps/desktop/src/renderer/contexts/database.ts+++ b/apps/desktop/src/renderer/contexts/database.ts@@ -1,7 +1,7 @@import {FieldAttributes,FieldType,- NodeRole,+ EntryRole,SelectOptionAttributes,ViewAttributes,} from '@colanode/core';@@ -14,7 +14,7 @@ interface DatabaseContext {views: ViewAttributes[];canEdit: boolean;canCreateRecord: boolean;- role: NodeRole;+ role: EntryRole;createField: (type: FieldType, name: string) => void;renameField: (id: string, name: string) => void;deleteField: (id: string) => void;diff --git a/apps/desktop/src/renderer/contexts/folder.ts b/apps/desktop/src/renderer/contexts/folder.tsindex 1b5bdee1..ca1aaa92 100644--- a/apps/desktop/src/renderer/contexts/folder.ts+++ b/apps/desktop/src/renderer/contexts/folder.ts@@ -8,7 +8,7 @@ interface FolderContext {files: FileWithState[];onClick: (event: React.MouseEvent<HTMLElement>, id: string) => void;onDoubleClick: (event: React.MouseEvent<HTMLElement>, id: string) => void;- onMove: (nodeId: string, targetId: string) => void;+ onMove: (entryId: string, targetId: string) => void;}export const FolderContext = createContext<FolderContext>({} as FolderContext);diff --git a/apps/desktop/src/renderer/contexts/radar.ts b/apps/desktop/src/renderer/contexts/radar.tsindex b9279dbe..9b483bb5 100644--- a/apps/desktop/src/renderer/contexts/radar.ts+++ b/apps/desktop/src/renderer/contexts/radar.ts@@ -1,5 +1,5 @@import { createContext, useContext } from 'react';-import { NodeType } from '@colanode/core';+import { EntryType } from '@colanode/core';import {AccountReadState,@@ -11,18 +11,18 @@ import {interface RadarContext {getAccountState: (accountId: string) => AccountReadState;getWorkspaceState: (userId: string) => WorkspaceReadState;- getChatState: (userId: string, nodeId: string) => ChatReadState;- getChannelState: (userId: string, nodeId: string) => ChannelReadState;+ getChatState: (userId: string, entryId: string) => ChatReadState;+ getChannelState: (userId: string, entryIdId: string) => ChannelReadState;markAsSeen: (userId: string,- nodeId: string,- nodeType: NodeType,+ entryId: string,+ entryType: EntryType,transactionId: string) => void;markAsOpened: (userId: string,- nodeId: string,- nodeType: NodeType,+ entryId: string,+ entryType: EntryType,transactionId: string) => void;}diff --git a/apps/desktop/src/renderer/contexts/workspace.ts b/apps/desktop/src/renderer/contexts/workspace.tsindex 10387bdc..5530126a 100644--- a/apps/desktop/src/renderer/contexts/workspace.ts+++ b/apps/desktop/src/renderer/contexts/workspace.ts@@ -3,13 +3,13 @@ import { createContext, useContext } from 'react';import { Workspace } from '@/shared/types/workspaces';interface WorkspaceContext extends Workspace {- openInMain: (nodeId: string) => void;- isNodeActive: (nodeId: string) => boolean;- openInModal: (nodeId: string) => void;- isModalActive: (nodeId: string) => boolean;+ openInMain: (entryId: string) => void;+ isEntryActive: (entryId: string) => boolean;+ openInModal: (entryId: string) => void;+ isModalActive: (entryId: string) => boolean;closeModal: () => void;closeMain: () => void;- closeNode: (nodeId: string) => void;+ closeEntry: (entryId: string) => void;openSettings: () => void;}diff --git a/apps/desktop/src/renderer/editor/commands/file.tsx b/apps/desktop/src/renderer/editor/commands/file.tsxindex 518ad9b4..32fd6181 100644--- a/apps/desktop/src/renderer/editor/commands/file.tsx+++ b/apps/desktop/src/renderer/editor/commands/file.tsx@@ -1,4 +1,3 @@-import { NodeTypes } from '@colanode/core';import { FilePlus } from 'lucide-react';import { EditorCommand } from '@/shared/types/editor';@@ -40,6 +39,7 @@ export const FileCommand: EditorCommand = {userId,parentId: documentId,rootId,+ entryId: documentId,});if (!output.success) {@@ -51,7 +51,7 @@ export const FileCommand: EditorCommand = {.focus().deleteRange(range).insertContent({- type: NodeTypes.File,+ type: 'file',attrs: {id: output.output.id,},diff --git a/apps/desktop/src/renderer/editor/commands/folder.tsx b/apps/desktop/src/renderer/editor/commands/folder.tsxindex 0081989a..0d33e549 100644--- a/apps/desktop/src/renderer/editor/commands/folder.tsx+++ b/apps/desktop/src/renderer/editor/commands/folder.tsx@@ -1,4 +1,3 @@-import { NodeTypes } from '@colanode/core';import { Folder } from 'lucide-react';import { EditorCommand } from '@/shared/types/editor';@@ -34,7 +33,7 @@ export const FolderCommand: EditorCommand = {.focus().deleteRange(range).insertContent({- type: NodeTypes.Folder,+ type: 'folder',attrs: {id: output.output.id,},diff --git a/apps/desktop/src/renderer/editor/commands/page.tsx b/apps/desktop/src/renderer/editor/commands/page.tsxindex d4bd4641..fa0af377 100644--- a/apps/desktop/src/renderer/editor/commands/page.tsx+++ b/apps/desktop/src/renderer/editor/commands/page.tsx@@ -1,4 +1,3 @@-import { NodeTypes } from '@colanode/core';import { FileText } from 'lucide-react';import { EditorCommand } from '@/shared/types/editor';@@ -33,7 +32,7 @@ export const PageCommand: EditorCommand = {.focus().deleteRange(range).insertContent({- type: NodeTypes.Page,+ type: 'page',attrs: {id: output.output.id,},diff --git a/apps/desktop/src/renderer/editor/views/folder.tsx b/apps/desktop/src/renderer/editor/views/folder.tsxindex e336b7d0..dbf48667 100644--- a/apps/desktop/src/renderer/editor/views/folder.tsx+++ b/apps/desktop/src/renderer/editor/views/folder.tsx@@ -10,8 +10,8 @@ export const FolderNodeView = ({ node }: NodeViewProps) => {const id = node.attrs.id;const { data } = useQuery({- type: 'node_get',- nodeId: id,+ type: 'entry_get',+ entryId: id,userId: workspace.userId,});diff --git a/apps/desktop/src/renderer/editor/views/page.tsx b/apps/desktop/src/renderer/editor/views/page.tsxindex 1fcbd987..862a1388 100644--- a/apps/desktop/src/renderer/editor/views/page.tsx+++ b/apps/desktop/src/renderer/editor/views/page.tsx@@ -10,8 +10,8 @@ export const PageNodeView = ({ node }: NodeViewProps) => {const id = node.attrs.id;const { data } = useQuery({- type: 'node_get',- nodeId: id,+ type: 'entry_get',+ entryId: id,userId: workspace.userId,});diff --git a/apps/desktop/src/renderer/radar-provider.tsx b/apps/desktop/src/renderer/radar-provider.tsxindex b60e8f3e..5f0cb739 100644--- a/apps/desktop/src/renderer/radar-provider.tsx+++ b/apps/desktop/src/renderer/radar-provider.tsx@@ -48,10 +48,10 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {hasUnseenChanges: false,};},- getChatState: (userId, nodeId) => {+ getChatState: (userId, entryId) => {const workspaceState = radarData[userId];if (workspaceState) {- const chatState = workspaceState.nodeStates[nodeId];+ const chatState = workspaceState.nodeStates[entryId];if (chatState && chatState.type === 'chat') {return chatState;}@@ -59,15 +59,15 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {return {type: 'chat',- nodeId,+ chatId: entryId,unseenMessagesCount: 0,mentionsCount: 0,};},- getChannelState: (userId, nodeId) => {+ getChannelState: (userId, entryId) => {const workspaceState = radarData[userId];if (workspaceState) {- const channelState = workspaceState.nodeStates[nodeId];+ const channelState = workspaceState.nodeStates[entryId];if (channelState && channelState.type === 'channel') {return channelState;}@@ -75,28 +75,36 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {return {type: 'channel',- nodeId,+ channelId: entryId,unseenMessagesCount: 0,mentionsCount: 0,};},- markAsSeen: (userId, nodeId, nodeType, transactionId) => {- window.colanode.executeMutation({- type: 'mark_node_as_seen',- nodeId,- nodeType,- transactionId,- userId,- });+ markAsSeen: (userId, entryId, entryType, transactionId) => {+ console.log('markAsSeen', userId, entryId, entryType, transactionId);+ // window.colanode.executeMutation({+ // type: 'mark_entry_as_seen',+ // entryId,+ // entryType,+ // transactionId,+ // userId,+ // });},- markAsOpened: (userId, nodeId, nodeType, transactionId) => {- window.colanode.executeMutation({- type: 'mark_node_as_opened',- nodeId,- nodeType,- transactionId,+ markAsOpened: (userId, entryId, entryType, transactionId) => {+ console.log(+ 'markAsOpened',userId,- });+ entryId,+ entryType,+ transactionId+ );+ // window.colanode.executeMutation({+ // type: 'mark_entry_as_opened',+ // entryId,+ // entryType,+ // transactionId,+ // userId,+ // });},}}>diff --git a/apps/desktop/src/shared/lib/databases.ts b/apps/desktop/src/shared/lib/databases.tsindex 43da68fb..a5cbd1c7 100644--- a/apps/desktop/src/shared/lib/databases.ts+++ b/apps/desktop/src/shared/lib/databases.ts@@ -6,7 +6,7 @@ import {generateNodeIndex,isStringArray,MultiSelectFieldAttributes,- RecordNode,+ RecordEntry,SelectFieldAttributes,ViewFieldAttributes,ViewFieldFilterAttributes,@@ -509,18 +509,18 @@ export const getFieldFilterOperators = (};export const filterRecords = (- records: RecordNode[],+ records: RecordEntry[],filter: ViewFilterAttributes,field: FieldAttributes,currentUserId: string-): RecordNode[] => {+): RecordEntry[] => {return records.filter((record) =>recordMatchesFilter(record, filter, field, currentUserId));};const recordMatchesFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFilterAttributes,field: FieldAttributes,currentUserId: string@@ -562,7 +562,7 @@ const recordMatchesFilter = (};const recordMatchesBooleanFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -586,7 +586,7 @@ const recordMatchesBooleanFilter = (};const recordMatchesCollaboratorFilter = (- _: RecordNode,+ _: RecordEntry,__: ViewFieldFilterAttributes,___: FieldAttributes) => {@@ -594,7 +594,7 @@ const recordMatchesCollaboratorFilter = (};const recordMatchesCreatedAtFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes) => {if (!filter.value) return false;@@ -628,7 +628,7 @@ const recordMatchesCreatedAtFilter = (};const recordMatchesCreatedByFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,currentUserId: string) => {@@ -661,7 +661,7 @@ const recordMatchesCreatedByFilter = (};const recordMatchesDateFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -707,7 +707,7 @@ const recordMatchesDateFilter = (};const recordMatchesEmailFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -749,7 +749,7 @@ const recordMatchesEmailFilter = (};const recordMatchesFileFilter = (- _: RecordNode,+ _: RecordEntry,__: ViewFieldFilterAttributes,___: FieldAttributes) => {@@ -757,7 +757,7 @@ const recordMatchesFileFilter = (};const recordMatchesMultiSelectFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -788,7 +788,7 @@ const recordMatchesMultiSelectFilter = (};const recordMatchesNumberFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -834,7 +834,7 @@ const recordMatchesNumberFilter = (};const recordMatchesPhoneFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -876,7 +876,7 @@ const recordMatchesPhoneFilter = (};const recordMatchesSelectFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -911,7 +911,7 @@ const recordMatchesSelectFilter = (};const recordMatchesTextFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {@@ -953,7 +953,7 @@ const recordMatchesTextFilter = (};const recordMatchesUrlFilter = (- record: RecordNode,+ record: RecordEntry,filter: ViewFieldFilterAttributes,field: FieldAttributes) => {diff --git a/apps/desktop/src/shared/lib/entries.ts b/apps/desktop/src/shared/lib/entries.tsnew file mode 100644index 00000000..25c75020--- /dev/null+++ b/apps/desktop/src/shared/lib/entries.ts@@ -0,0 +1,42 @@+import { extractEntryCollaborators, Entry, EntryType } from '@colanode/core';++import { EntryCollaborator } from '@/shared/types/entries';++export const getDefaultEntryIcon = (type: EntryType) => {+ switch (type) {+ case 'channel':+ return 'discuss-line';+ case 'page':+ return 'book-line';+ case 'database':+ return 'database-2-line';+ case 'record':+ return 'article-line';+ case 'folder':+ return 'folder-open-line';+ case 'space':+ return 'team-line';+ default:+ return 'file-unknown-line';+ }+};++export const buildEntryCollaborators = (+ entries: Entry[]+): EntryCollaborator[] => {+ const collaborators: Record<string, EntryCollaborator> = {};++ for (const entry of entries) {+ const entryCollaborators = extractEntryCollaborators(entry.attributes);++ for (const [collaboratorId, role] of Object.entries(entryCollaborators)) {+ collaborators[collaboratorId] = {+ entryId: entry.id,+ collaboratorId,+ role,+ };+ }+ }++ return Object.values(collaborators);+};diff --git a/apps/desktop/src/shared/lib/nodes.ts b/apps/desktop/src/shared/lib/nodes.tsdeleted file mode 100644index bacee831..00000000--- a/apps/desktop/src/shared/lib/nodes.ts+++ /dev/null@@ -1,40 +0,0 @@-import { extractNodeCollaborators, Node, NodeTypes } from '@colanode/core';--import { NodeCollaborator } from '@/shared/types/nodes';--export const getDefaultNodeIcon = (type: string) => {- switch (type) {- case NodeTypes.Channel:- return 'discuss-line';- case NodeTypes.Page:- return 'book-line';- case NodeTypes.Database:- return 'database-2-line';- case NodeTypes.Record:- return 'article-line';- case NodeTypes.Folder:- return 'folder-open-line';- case NodeTypes.Space:- return 'team-line';- default:- return 'file-unknown-line';- }-};--export const buildNodeCollaborators = (nodes: Node[]): NodeCollaborator[] => {- const collaborators: Record<string, NodeCollaborator> = {};-- for (const node of nodes) {- const nodeCollaborators = extractNodeCollaborators(node.attributes);-- for (const [collaboratorId, role] of Object.entries(nodeCollaborators)) {- collaborators[collaboratorId] = {- nodeId: node.id,- collaboratorId,- role,- };- }- }-- return Object.values(collaborators);-};diff --git a/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-create.ts b/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-create.tsnew file mode 100644index 00000000..11282a87--- /dev/null+++ b/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-create.ts@@ -0,0 +1,20 @@+export type EntryCollaboratorCreateMutationInput = {+ type: 'entry_collaborator_create';+ userId: string;+ entryId: string;+ collaboratorIds: string[];+ role: string;+};++export type EntryCollaboratorCreateMutationOutput = {+ success: boolean;+};++declare module '@/shared/mutations' {+ interface MutationMap {+ entry_collaborator_create: {+ input: EntryCollaboratorCreateMutationInput;+ output: EntryCollaboratorCreateMutationOutput;+ };+ }+}diff --git a/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-delete.ts b/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-delete.tsnew file mode 100644index 00000000..2ce36c86--- /dev/null+++ b/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-delete.ts@@ -0,0 +1,19 @@+export type EntryCollaboratorDeleteMutationInput = {+ type: 'entry_collaborator_delete';+ userId: string;+ entryId: string;+ collaboratorId: string;+};++export type EntryCollaboratorDeleteMutationOutput = {+ success: boolean;+};++declare module '@/shared/mutations' {+ interface MutationMap {+ entry_collaborator_delete: {+ input: EntryCollaboratorDeleteMutationInput;+ output: EntryCollaboratorDeleteMutationOutput;+ };+ }+}diff --git a/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-update.ts b/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-update.tsnew file mode 100644index 00000000..3607d438--- /dev/null+++ b/apps/desktop/src/shared/mutations/collaborators/entry-collaborator-update.ts@@ -0,0 +1,20 @@+export type EntryCollaboratorUpdateMutationInput = {+ type: 'entry_collaborator_update';+ userId: string;+ entryId: string;+ collaboratorId: string;+ role: string;+};++export type EntryCollaboratorUpdateMutationOutput = {+ success: boolean;+};++declare module '@/shared/mutations' {+ interface MutationMap {+ entry_collaborator_update: {+ input: EntryCollaboratorUpdateMutationInput;+ output: EntryCollaboratorUpdateMutationOutput;+ };+ }+}diff --git a/apps/desktop/src/shared/mutations/collaborators/node-collaborator-create.ts b/apps/desktop/src/shared/mutations/collaborators/node-collaborator-create.tsdeleted file mode 100644index a1601b1f..00000000--- a/apps/desktop/src/shared/mutations/collaborators/node-collaborator-create.ts+++ /dev/null@@ -1,20 +0,0 @@-export type NodeCollaboratorCreateMutationInput = {- type: 'node_collaborator_create';- userId: string;- nodeId: string;- collaboratorIds: string[];- role: string;-};--export type NodeCollaboratorCreateMutationOutput = {- success: boolean;-};--declare module '@/shared/mutations' {- interface MutationMap {- node_collaborator_create: {- input: NodeCollaboratorCreateMutationInput;- output: NodeCollaboratorCreateMutationOutput;- };- }-}diff --git a/apps/desktop/src/shared/mutations/collaborators/node-collaborator-delete.ts b/apps/desktop/src/shared/mutations/collaborators/node-collaborator-delete.tsdeleted file mode 100644index faedcfc2..00000000--- a/apps/desktop/src/shared/mutations/collaborators/node-collaborator-delete.ts+++ /dev/null@@ -1,19 +0,0 @@-export type NodeCollaboratorDeleteMutationInput = {- type: 'node_collaborator_delete';- userId: string;- nodeId: string;- collaboratorId: string;-};--export type NodeCollaboratorDeleteMutationOutput = {- success: boolean;-};--declare module '@/shared/mutations' {- interface MutationMap {- node_collaborator_delete: {- input: NodeCollaboratorDeleteMutationInput;- output: NodeCollaboratorDeleteMutationOutput;- };- }-}diff --git a/apps/desktop/src/shared/mutations/collaborators/node-collaborator-update.ts b/apps/desktop/src/shared/mutations/collaborators/node-collaborator-update.tsdeleted file mode 100644index f14b8492..00000000--- a/apps/desktop/src/shared/mutations/collaborators/node-collaborator-update.ts+++ /dev/null@@ -1,20 +0,0 @@-export type NodeCollaboratorUpdateMutationInput = {- type: 'node_collaborator_update';- userId: string;- nodeId: string;- collaboratorId: string;- role: string;-};--export type NodeCollaboratorUpdateMutationOutput = {- success: boolean;-};--declare module '@/shared/mutations' {- interface MutationMap {- node_collaborator_update: {- input: NodeCollaboratorUpdateMutationInput;- output: NodeCollaboratorUpdateMutationOutput;- };- }-}diff --git a/apps/desktop/src/shared/mutations/files/file-create.ts b/apps/desktop/src/shared/mutations/files/file-create.tsindex 09e2922e..8eedf386 100644--- a/apps/desktop/src/shared/mutations/files/file-create.ts+++ b/apps/desktop/src/shared/mutations/files/file-create.ts@@ -2,6 +2,7 @@ export type FileCreateMutationInput = {type: 'file_create';userId: string;parentId: string;+ entryId: string;rootId: string;filePath: string;};diff --git a/apps/desktop/src/shared/mutations/interactions/mark-node-as-opened.ts b/apps/desktop/src/shared/mutations/interactions/mark-node-as-opened.tsdeleted file mode 100644index 35558779..00000000--- a/apps/desktop/src/shared/mutations/interactions/mark-node-as-opened.ts+++ /dev/null@@ -1,19 +0,0 @@-export type MarkNodeAsOpenedMutationInput = {- type: 'mark_node_as_opened';- userId: string;- nodeId: string;- transactionId: string;-};--export type MarkNodeAsOpenedMutationOutput = {- success: boolean;-};--declare module '@/shared/mutations' {- interface MutationMap {- mark_node_as_opened: {- input: MarkNodeAsOpenedMutationInput;- output: MarkNodeAsOpenedMutationOutput;- };- }-}diff --git a/apps/desktop/src/shared/mutations/interactions/mark-node-as-seen.ts b/apps/desktop/src/shared/mutations/interactions/mark-node-as-seen.tsdeleted file mode 100644index ad769ef5..00000000--- a/apps/desktop/src/shared/mutations/interactions/mark-node-as-seen.ts+++ /dev/null@@ -1,22 +0,0 @@-import { NodeType } from '@colanode/core';--export type MarkNodeAsSeenMutationInput = {- type: 'mark_node_as_seen';- userId: string;- nodeId: string;- nodeType: NodeType;- transactionId: string;-};--export type MarkNodeAsSeenMutationOutput = {- success: boolean;-};--declare module '@/shared/mutations' {- interface MutationMap {- mark_node_as_seen: {- input: MarkNodeAsSeenMutationInput;- output: MarkNodeAsSeenMutationOutput;- };- }-}diff --git a/apps/desktop/src/shared/queries/databases/database-list.ts b/apps/desktop/src/shared/queries/databases/database-list.tsindex e7c05947..8fa52701 100644--- a/apps/desktop/src/shared/queries/databases/database-list.ts+++ b/apps/desktop/src/shared/queries/databases/database-list.ts@@ -1,4 +1,4 @@-import { DatabaseNode } from '@colanode/core';+import { DatabaseEntry } from '@colanode/core';export type DatabaseListQueryInput = {type: 'database_list';@@ -9,7 +9,7 @@ declare module '@/shared/queries' {interface QueryMap {database_list: {input: DatabaseListQueryInput;- output: DatabaseNode[];+ output: DatabaseEntry[];};}}diff --git a/apps/desktop/src/shared/queries/entries/entry-children-get.ts b/apps/desktop/src/shared/queries/entries/entry-children-get.tsnew file mode 100644index 00000000..e778772c--- /dev/null+++ b/apps/desktop/src/shared/queries/entries/entry-children-get.ts@@ -0,0 +1,17 @@+import { Entry, EntryType } from '@colanode/core';++export type EntryChildrenGetQueryInput = {+ type: 'entry_children_get';+ entryId: string;+ userId: string;+ types?: EntryType[];+};++declare module '@/shared/queries' {+ interface QueryMap {+ entry_children_get: {+ input: EntryChildrenGetQueryInput;+ output: Entry[];+ };+ }+}diff --git a/apps/desktop/src/shared/queries/entries/entry-get.ts b/apps/desktop/src/shared/queries/entries/entry-get.tsnew file mode 100644index 00000000..d0c26e63--- /dev/null+++ b/apps/desktop/src/shared/queries/entries/entry-get.ts@@ -0,0 +1,16 @@+import { Entry } from '@colanode/core';++export type EntryGetQueryInput = {+ type: 'entry_get';+ entryId: string;+ userId: string;+};++declare module '@/shared/queries' {+ interface QueryMap {+ entry_get: {+ input: EntryGetQueryInput;+ output: Entry | null;+ };+ }+}diff --git a/apps/desktop/src/shared/queries/entries/entry-tree-get.ts b/apps/desktop/src/shared/queries/entries/entry-tree-get.tsnew file mode 100644index 00000000..54817115--- /dev/null+++ b/apps/desktop/src/shared/queries/entries/entry-tree-get.ts@@ -0,0 +1,16 @@+import { Entry } from '@colanode/core';++export type EntryTreeGetQueryInput = {+ type: 'entry_tree_get';+ entryId: string;+ userId: string;+};++declare module '@/shared/queries' {+ interface QueryMap {+ entry_tree_get: {+ input: EntryTreeGetQueryInput;+ output: Entry[];+ };+ }+}diff --git a/apps/desktop/src/shared/queries/nodes/node-children-get.ts b/apps/desktop/src/shared/queries/nodes/node-children-get.tsdeleted file mode 100644index ae5e0949..00000000--- a/apps/desktop/src/shared/queries/nodes/node-children-get.ts+++ /dev/null@@ -1,17 +0,0 @@-import { Node, NodeType } from '@colanode/core';--export type NodeChildrenGetQueryInput = {- type: 'node_children_get';- nodeId: string;- userId: string;- types?: NodeType[];-};--declare module '@/shared/queries' {- interface QueryMap {- node_children_get: {- input: NodeChildrenGetQueryInput;- output: Node[];- };- }-}diff --git a/apps/desktop/src/shared/queries/nodes/node-get.ts b/apps/desktop/src/shared/queries/nodes/node-get.tsdeleted file mode 100644index 2049e6e0..00000000--- a/apps/desktop/src/shared/queries/nodes/node-get.ts+++ /dev/null@@ -1,16 +0,0 @@-import { Node } from '@colanode/core';--export type NodeGetQueryInput = {- type: 'node_get';- nodeId: string;- userId: string;-};--declare module '@/shared/queries' {- interface QueryMap {- node_get: {- input: NodeGetQueryInput;- output: Node | null;- };- }-}diff --git a/apps/desktop/src/shared/queries/nodes/node-tree-get.ts b/apps/desktop/src/shared/queries/nodes/node-tree-get.tsdeleted file mode 100644index 9fbb8c1a..00000000--- a/apps/desktop/src/shared/queries/nodes/node-tree-get.ts+++ /dev/null@@ -1,16 +0,0 @@-import { Node } from '@colanode/core';--export type NodeTreeGetQueryInput = {- type: 'node_tree_get';- nodeId: string;- userId: string;-};--declare module '@/shared/queries' {- interface QueryMap {- node_tree_get: {- input: NodeTreeGetQueryInput;- output: Node[];- };- }-}diff --git a/apps/desktop/src/shared/queries/records/record-list.ts b/apps/desktop/src/shared/queries/records/record-list.tsindex 03a68dd7..c4b6d7ce 100644--- a/apps/desktop/src/shared/queries/records/record-list.ts+++ b/apps/desktop/src/shared/queries/records/record-list.ts@@ -1,5 +1,5 @@import {- RecordNode,+ RecordEntry,ViewFilterAttributes,ViewSortAttributes,} from '@colanode/core';@@ -18,7 +18,7 @@ declare module '@/shared/queries' {interface QueryMap {record_list: {input: RecordListQueryInput;- output: RecordNode[];+ output: RecordEntry[];};}}diff --git a/apps/desktop/src/shared/queries/records/record-search.ts b/apps/desktop/src/shared/queries/records/record-search.tsindex 5cf82913..ea4696df 100644--- a/apps/desktop/src/shared/queries/records/record-search.ts+++ b/apps/desktop/src/shared/queries/records/record-search.ts@@ -1,4 +1,4 @@-import { RecordNode } from '@colanode/core';+import { RecordEntry } from '@colanode/core';export type RecordSearchQueryInput = {type: 'record_search';@@ -12,7 +12,7 @@ declare module '@/shared/queries' {interface QueryMap {record_search: {input: RecordSearchQueryInput;- output: RecordNode[];+ output: RecordEntry[];};}}diff --git a/apps/desktop/src/shared/types/entries.ts b/apps/desktop/src/shared/types/entries.tsnew file mode 100644index 00000000..ecbe897a--- /dev/null+++ b/apps/desktop/src/shared/types/entries.ts@@ -0,0 +1,7 @@+import { EntryRole } from '@colanode/core';++export type EntryCollaborator = {+ entryId: string;+ collaboratorId: string;+ role: EntryRole;+};diff --git a/apps/desktop/src/shared/types/events.ts b/apps/desktop/src/shared/types/events.tsindex 9968b2f9..3189d0f2 100644--- a/apps/desktop/src/shared/types/events.ts+++ b/apps/desktop/src/shared/types/events.ts@@ -1,4 +1,4 @@-import { Node } from '@colanode/core';+import { Entry } from '@colanode/core';import { MessageNode, MessageReaction } from '@/shared/types/messages';import { Account } from '@/shared/types/accounts';@@ -26,22 +26,22 @@ export type UserDeletedEvent = {user: User;};-export type NodeCreatedEvent = {- type: 'node_created';+export type EntryCreatedEvent = {+ type: 'entry_created';userId: string;- node: Node;+ entry: Entry;};-export type NodeUpdatedEvent = {- type: 'node_updated';+export type EntryUpdatedEvent = {+ type: 'entry_updated';userId: string;- node: Node;+ entry: Entry;};-export type NodeDeletedEvent = {- type: 'node_deleted';+export type EntryDeletedEvent = {+ type: 'entry_deleted';userId: string;- node: Node;+ entry: Entry;};export type MessageCreatedEvent = {@@ -168,13 +168,13 @@ export type MutationCreatedEvent = {export type CollaborationCreatedEvent = {type: 'collaboration_created';userId: string;- nodeId: string;+ entryId: string;};export type CollaborationDeletedEvent = {type: 'collaboration_deleted';userId: string;- nodeId: string;+ entryId: string;};export type ServerAvailabilityChangedEvent = {@@ -191,7 +191,7 @@ export type SocketConnectionOpenedEvent = {export type InteractionEventCreatedEvent = {type: 'interaction_event_created';userId: string;- nodeId: string;+ entryId: string;};export type InteractionUpdatedEvent = {@@ -204,9 +204,9 @@ export type Event =| UserCreatedEvent| UserUpdatedEvent| UserDeletedEvent- | NodeCreatedEvent- | NodeUpdatedEvent- | NodeDeletedEvent+ | EntryCreatedEvent+ | EntryUpdatedEvent+ | EntryDeletedEvent| MessageCreatedEvent| MessageUpdatedEvent| MessageDeletedEventdiff --git a/apps/desktop/src/shared/types/interactions.ts b/apps/desktop/src/shared/types/interactions.tsindex e737923a..85d2956c 100644--- a/apps/desktop/src/shared/types/interactions.ts+++ b/apps/desktop/src/shared/types/interactions.ts@@ -2,7 +2,7 @@ import { InteractionAttributes } from '@colanode/core';export type Interaction = {userId: string;- nodeId: string;+ entryId: string;attributes: InteractionAttributes;createdAt: Date;updatedAt: Date | null;diff --git a/apps/desktop/src/shared/types/nodes.ts b/apps/desktop/src/shared/types/nodes.tsdeleted file mode 100644index 5ab2d9d6..00000000--- a/apps/desktop/src/shared/types/nodes.ts+++ /dev/null@@ -1,7 +0,0 @@-import { NodeRole } from '@colanode/core';--export type NodeCollaborator = {- nodeId: string;- collaboratorId: string;- role: NodeRole;-};diff --git a/apps/desktop/src/shared/types/radars.ts b/apps/desktop/src/shared/types/radars.tsindex 93ff7a9d..48ed5193 100644--- a/apps/desktop/src/shared/types/radars.ts+++ b/apps/desktop/src/shared/types/radars.ts@@ -1,40 +1,40 @@export type ChannelReadState = {type: 'channel';- nodeId: string;+ channelId: string;unseenMessagesCount: number;mentionsCount: number;};export type ChatReadState = {type: 'chat';- nodeId: string;+ chatId: string;unseenMessagesCount: number;mentionsCount: number;};export type DatabaseReadState = {type: 'database';- nodeId: string;+ databaseId: string;unseenRecordsCount: number;};export type RecordReadState = {type: 'record';- nodeId: string;+ recordId: string;hasUnseenChanges: boolean;mentionsCount: number;};export type PageState = {type: 'page';- nodeId: string;+ pageId: string;hasUnseenChanges: boolean;mentionsCount: number;};export type FolderState = {type: 'folder';- nodeId: string;+ folderId: string;unseenFilesCount: number;};diff --git a/apps/server/src/controllers/client/workspaces/files/file-download-get.ts b/apps/server/src/controllers/client/workspaces/files/file-download-get.tsindex 3623a449..7538f53e 100644--- a/apps/server/src/controllers/client/workspaces/files/file-download-get.ts+++ b/apps/server/src/controllers/client/workspaces/files/file-download-get.ts@@ -5,7 +5,7 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';import { ApiError } from '@/types/api';import { database } from '@/data/database';-import { fetchNodeRole } from '@/lib/nodes';+import { fetchEntryRole } from '@/lib/entries';import { BUCKET_NAMES, filesStorage } from '@/data/storage';export const fileDownloadGetHandler = async (@@ -28,7 +28,7 @@ export const fileDownloadGetHandler = async (return;}- const role = await fetchNodeRole(file.root_id, res.locals.user.id);+ const role = await fetchEntryRole(file.root_id, res.locals.user.id);if (role === null || !hasViewerAccess(role)) {res.status(403).json({code: ApiError.Forbidden,diff --git a/apps/server/src/controllers/client/workspaces/mutations/mutations-sync.ts b/apps/server/src/controllers/client/workspaces/mutations/mutations-sync.tsindex 39e2b2fa..eafed537 100644--- a/apps/server/src/controllers/client/workspaces/mutations/mutations-sync.ts+++ b/apps/server/src/controllers/client/workspaces/mutations/mutations-sync.ts@@ -14,7 +14,7 @@ import {} from '@colanode/core';import { SelectUser } from '@/data/schema';-import { nodeService } from '@/services/node-service';+import { entryService } from '@/services/entry-service';import { fileService } from '@/services/file-service';import { messageService } from '@/services/message-service';@@ -72,9 +72,9 @@ const handleCreateTransaction = async (user: SelectUser,mutation: ApplyCreateTransactionMutation): Promise<SyncMutationStatus> => {- const output = await nodeService.applyCreateTransaction(user, {+ const output = await entryService.applyCreateTransaction(user, {id: mutation.data.id,- nodeId: mutation.data.nodeId,+ entryId: mutation.data.entryId,rootId: mutation.data.rootId,data: mutation.data.data,createdAt: new Date(mutation.data.createdAt),@@ -91,9 +91,9 @@ const handleUpdateTransaction = async (user: SelectUser,mutation: ApplyUpdateTransactionMutation): Promise<SyncMutationStatus> => {- const output = await nodeService.applyUpdateTransaction(user, {+ const output = await entryService.applyUpdateTransaction(user, {id: mutation.data.id,- nodeId: mutation.data.nodeId,+ entryId: mutation.data.entryId,rootId: mutation.data.rootId,userId: mutation.data.createdBy,data: mutation.data.data,@@ -111,9 +111,9 @@ const handleDeleteTransaction = async (user: SelectUser,mutation: ApplyDeleteTransactionMutation): Promise<SyncMutationStatus> => {- const output = await nodeService.applyDeleteTransaction(user, {+ const output = await entryService.applyDeleteTransaction(user, {id: mutation.data.id,- nodeId: mutation.data.nodeId,+ entryId: mutation.data.entryId,rootId: mutation.data.rootId,createdAt: new Date(mutation.data.createdAt),});diff --git a/apps/server/src/data/migrations.ts b/apps/server/src/data/migrations.tsindex 3ccd7772..501a33c8 100644--- a/apps/server/src/data/migrations.ts+++ b/apps/server/src/data/migrations.ts@@ -129,10 +129,10 @@ const createUsersTable: Migration = {},};-const createNodesTable: Migration = {+const createEntriesTable: Migration = {up: async (db) => {await db.schema- .createTable('nodes')+ .createTable('entries').addColumn('id', 'varchar(30)', (col) => col.notNull().primaryKey()).addColumn('type', 'varchar(30)', (col) =>col.generatedAlwaysAs(sql`(attributes->>'type')::VARCHAR(30)`).stored()@@ -154,7 +154,7 @@ const createNodesTable: Migration = {.execute();},down: async (db) => {- await db.schema.dropTable('nodes').execute();+ await db.schema.dropTable('entries').execute();},};@@ -172,7 +172,7 @@ const createTransactionsTable: Migration = {await db.schema.createTable('transactions').addColumn('id', 'varchar(30)', (col) => col.notNull().primaryKey())- .addColumn('node_id', 'varchar(30)', (col) => col.notNull())+ .addColumn('entry_id', 'varchar(30)', (col) => col.notNull()).addColumn('root_id', 'varchar(30)', (col) => col.notNull()).addColumn('workspace_id', 'varchar(30)', (col) => col.notNull()).addColumn('operation', 'varchar(30)', (col) => col.notNull())@@ -206,7 +206,7 @@ const createCollaborationsTable: Migration = {await db.schema.createTable('collaborations')- .addColumn('node_id', 'varchar(30)', (col) => col.notNull())+ .addColumn('entry_id', 'varchar(30)', (col) => col.notNull()).addColumn('collaborator_id', 'varchar(30)', (col) => col.notNull()).addColumn('workspace_id', 'varchar(30)', (col) => col.notNull()).addColumn('role', 'varchar(30)', (col) => col.notNull())@@ -220,7 +220,7 @@ const createCollaborationsTable: Migration = {col.notNull().defaultTo(sql`nextval('collaborations_version_sequence')`)).addPrimaryKeyConstraint('collaborations_pkey', [- 'node_id',+ 'entry_id','collaborator_id',]).execute();@@ -268,7 +268,7 @@ const createMessagesTable: Migration = {.addColumn('id', 'varchar(30)', (col) => col.notNull().primaryKey()).addColumn('type', 'varchar(30)', (col) => col.notNull()).addColumn('parent_id', 'varchar(30)', (col) => col.notNull())- .addColumn('node_id', 'varchar(30)', (col) => col.notNull())+ .addColumn('entry_id', 'varchar(30)', (col) => col.notNull()).addColumn('root_id', 'varchar(30)', (col) => col.notNull()).addColumn('workspace_id', 'varchar(30)', (col) => col.notNull()).addColumn('content', 'text', (col) => col.notNull())@@ -378,6 +378,7 @@ const createFilesTable: Migration = {.addColumn('id', 'varchar(30)', (col) => col.notNull().primaryKey()).addColumn('type', 'varchar(30)', (col) => col.notNull()).addColumn('parent_id', 'varchar(30)', (col) => col.notNull())+ .addColumn('entry_id', 'varchar(30)', (col) => col.notNull()).addColumn('root_id', 'varchar(30)', (col) => col.notNull()).addColumn('workspace_id', 'varchar(30)', (col) => col.notNull()).addColumn('name', 'varchar(256)', (col) => col.notNull())@@ -422,56 +423,56 @@ const createFilesTable: Migration = {},};-const createNodePathsTable: Migration = {+const createEntryPathsTable: Migration = {up: async (db) => {await db.schema- .createTable('node_paths')+ .createTable('entry_paths').addColumn('ancestor_id', 'varchar(30)', (col) =>- col.notNull().references('nodes.id').onDelete('cascade')+ col.notNull().references('entries.id').onDelete('cascade')).addColumn('descendant_id', 'varchar(30)', (col) =>- col.notNull().references('nodes.id').onDelete('cascade')+ col.notNull().references('entries.id').onDelete('cascade')).addColumn('workspace_id', 'varchar(30)', (col) => col.notNull()).addColumn('level', 'integer', (col) => col.notNull())- .addPrimaryKeyConstraint('node_paths_pkey', [+ .addPrimaryKeyConstraint('entry_paths_pkey', ['ancestor_id','descendant_id',]).execute();await sql`- CREATE OR REPLACE FUNCTION fn_insert_node_path() RETURNS TRIGGER AS $$+ CREATE OR REPLACE FUNCTION fn_insert_entry_path() RETURNS TRIGGER AS $$BEGIN- -- Insert direct path from the new node to itself- INSERT INTO node_paths (ancestor_id, descendant_id, workspace_id, level)+ -- Insert direct path from the new entry to itself+ INSERT INTO entry_paths (ancestor_id, descendant_id, workspace_id, level)VALUES (NEW.id, NEW.id, NEW.workspace_id, 0);- -- Insert paths from ancestors to the new node- INSERT INTO node_paths (ancestor_id, descendant_id, workspace_id, level)+ -- Insert paths from ancestors to the new entry+ INSERT INTO entry_paths (ancestor_id, descendant_id, workspace_id, level)SELECT ancestor_id, NEW.id, NEW.workspace_id, level + 1- FROM node_paths+ FROM entry_pathsWHERE descendant_id = NEW.parent_id AND ancestor_id <> NEW.id;RETURN NEW;END;$$ LANGUAGE plpgsql;- CREATE TRIGGER trg_insert_node_path- AFTER INSERT ON nodes+ CREATE TRIGGER trg_insert_entry_path+ AFTER INSERT ON entriesFOR EACH ROW- EXECUTE FUNCTION fn_insert_node_path();+ EXECUTE FUNCTION fn_insert_entry_path();- CREATE OR REPLACE FUNCTION fn_update_node_path() RETURNS TRIGGER AS $$+ CREATE OR REPLACE FUNCTION fn_update_entry_path() RETURNS TRIGGER AS $$BEGINIF OLD.parent_id IS DISTINCT FROM NEW.parent_id THEN- -- Delete old paths involving the updated node- DELETE FROM node_paths+ -- Delete old paths involving the updated entry+ DELETE FROM entry_pathsWHERE descendant_id = NEW.id AND ancestor_id <> NEW.id;- INSERT INTO node_paths (ancestor_id, descendant_id, workspace_id, level)+ INSERT INTO entry_paths (ancestor_id, descendant_id, workspace_id, level)SELECT ancestor_id, NEW.id, NEW.workspace_id, level + 1- FROM node_paths+ FROM entry_pathsWHERE descendant_id = NEW.parent_id AND ancestor_id <> NEW.id;END IF;@@ -479,72 +480,20 @@ const createNodePathsTable: Migration = {END;$$ LANGUAGE plpgsql;- CREATE TRIGGER trg_update_node_path- AFTER UPDATE ON nodes- EXECUTE FUNCTION fn_update_node_path();+ CREATE TRIGGER trg_update_entry_path+ AFTER UPDATE ON entries+ EXECUTE FUNCTION fn_update_entry_path();`.execute(db);},down: async (db) => {await sql`- DROP TRIGGER IF EXISTS trg_insert_node_path ON nodes;- DROP TRIGGER IF EXISTS trg_update_node_path ON nodes;- DROP FUNCTION IF EXISTS fn_insert_node_path();- DROP FUNCTION IF EXISTS fn_update_node_path();+ DROP TRIGGER IF EXISTS trg_insert_entry_path ON entries;+ DROP TRIGGER IF EXISTS trg_update_entry_path ON entries;+ DROP FUNCTION IF EXISTS fn_insert_entry_path();+ DROP FUNCTION IF EXISTS fn_update_entry_path();`.execute(db);- await db.schema.dropTable('node_paths').execute();- },-};--const createInteractionsTable: Migration = {- up: async (db) => {- await sql`- CREATE SEQUENCE IF NOT EXISTS interactions_version_seq- START WITH 1000000000- INCREMENT BY 1- NO MINVALUE- NO MAXVALUE- CACHE 1;- `.execute(db);-- await db.schema- .createTable('interactions')- .addColumn('user_id', 'varchar(30)', (col) => col.notNull())- .addColumn('node_id', 'varchar(30)', (col) => col.notNull())- .addColumn('workspace_id', 'varchar(30)', (col) => col.notNull())- .addColumn('attributes', 'jsonb')- .addColumn('created_at', 'timestamptz', (col) => col.notNull())- .addColumn('updated_at', 'timestamptz')- .addColumn('server_created_at', 'timestamptz', (col) => col.notNull())- .addColumn('server_updated_at', 'timestamptz')- .addColumn('version', 'bigint', (col) =>- col.notNull().defaultTo(sql`nextval('interactions_version_seq')`)- )- .addPrimaryKeyConstraint('interactions_pkey', ['user_id', 'node_id'])- .execute();-- await sql`- CREATE OR REPLACE FUNCTION update_interaction_version() RETURNS TRIGGER AS $$- BEGIN- NEW.version = nextval('interactions_version_seq');- RETURN NEW;- END;- $$ LANGUAGE plpgsql;-- CREATE TRIGGER trg_update_interaction_version- BEFORE UPDATE ON interactions- FOR EACH ROW- EXECUTE FUNCTION update_interaction_version();- `.execute(db);- },- down: async (db) => {- await sql`- DROP TRIGGER IF EXISTS trg_update_interaction_version ON interactions;- DROP FUNCTION IF EXISTS update_interaction_version();- DROP SEQUENCE IF EXISTS interactions_version_seq;- `.execute(db);-- await db.schema.dropTable('interactions').execute();+ await db.schema.dropTable('entry_paths').execute();},};@@ -553,12 +502,11 @@ export const databaseMigrations: Record<string, Migration> = {'00002_create_devices_table': createDevicesTable,'00003_create_workspaces_table': createWorkspacesTable,'00004_create_users_table': createUsersTable,- '00005_create_nodes_table': createNodesTable,+ '00005_create_entries_table': createEntriesTable,'00006_create_transactions_table': createTransactionsTable,'00007_create_messages_table': createMessagesTable,'00008_create_message_reactions_table': createMessageReactionsTable,'00009_create_files_table': createFilesTable,'00010_create_collaborations_table': createCollaborationsTable,- '00011_create_node_paths_table': createNodePathsTable,- '00012_create_interactions_table': createInteractionsTable,+ '00011_create_entry_paths_table': createEntryPathsTable,};diff --git a/apps/server/src/data/schema.ts b/apps/server/src/data/schema.tsindex 31f22d4b..5953f77a 100644--- a/apps/server/src/data/schema.ts+++ b/apps/server/src/data/schema.ts@@ -1,10 +1,9 @@import {FileStatus,FileType,- InteractionAttributes,- NodeAttributes,- NodeRole,- NodeType,+ EntryAttributes,+ EntryRole,+ EntryType,WorkspaceRole,MessageType,} from '@colanode/core';@@ -94,13 +93,13 @@ export type SelectUser = Selectable<UserTable>;export type CreateUser = Insertable<UserTable>;export type UpdateUser = Updateable<UserTable>;-interface NodeTable {+interface EntryTable {id: ColumnType<string, string, never>;- type: ColumnType<NodeType, never, never>;+ type: ColumnType<EntryType, never, never>;parent_id: ColumnType<string, never, never>;root_id: ColumnType<string, string, never>;workspace_id: ColumnType<string, string, never>;- attributes: JSONColumnType<NodeAttributes, string | null, string | null>;+ attributes: JSONColumnType<EntryAttributes, string | null, string | null>;created_at: ColumnType<Date, Date, never>;updated_at: ColumnType<Date | null, Date | null, Date>;created_by: ColumnType<string, string, never>;@@ -108,15 +107,15 @@ interface NodeTable {transaction_id: ColumnType<string, string, string>;}-export type SelectNode = Selectable<NodeTable>;-export type CreateNode = Insertable<NodeTable>;-export type UpdateNode = Updateable<NodeTable>;+export type SelectEntry = Selectable<EntryTable>;+export type CreateEntry = Insertable<EntryTable>;+export type UpdateEntry = Updateable<EntryTable>;interface CollaborationTable {- node_id: ColumnType<string, string, never>;+ entry_id: ColumnType<string, string, never>;collaborator_id: ColumnType<string, string, never>;workspace_id: ColumnType<string, string, never>;- role: ColumnType<NodeRole, NodeRole, NodeRole>;+ role: ColumnType<EntryRole, EntryRole, EntryRole>;created_at: ColumnType<Date, Date, never>;created_by: ColumnType<string, string, never>;updated_at: ColumnType<Date | null, Date | null, Date | null>;@@ -132,7 +131,7 @@ export type UpdateCollaboration = Updateable<CollaborationTable>;interface TransactionTable {id: ColumnType<string, string, never>;- node_id: ColumnType<string, string, never>;+ entry_id: ColumnType<string, string, never>;root_id: ColumnType<string, string, never>;workspace_id: ColumnType<string, string, never>;operation: ColumnType<string, string, never>;@@ -151,7 +150,7 @@ interface MessageTable {id: ColumnType<string, string, never>;type: ColumnType<MessageType, MessageType, MessageType>;parent_id: ColumnType<string, string, never>;- node_id: ColumnType<string, string, never>;+ entry_id: ColumnType<string, string, never>;root_id: ColumnType<string, string, never>;workspace_id: ColumnType<string, string, never>;content: ColumnType<string, string, never>;@@ -187,6 +186,7 @@ interface FileTable {id: ColumnType<string, string, never>;type: ColumnType<FileType, FileType, FileType>;parent_id: ColumnType<string, string, never>;+ entry_id: ColumnType<string, string, never>;root_id: ColumnType<string, string, never>;workspace_id: ColumnType<string, string, never>;name: ColumnType<string, string, never>;@@ -208,48 +208,27 @@ export type SelectFile = Selectable<FileTable>;export type CreateFile = Insertable<FileTable>;export type UpdateFile = Updateable<FileTable>;-interface NodePathTable {+interface EntryPathTable {ancestor_id: ColumnType<string, string, never>;descendant_id: ColumnType<string, string, never>;workspace_id: ColumnType<string, string, never>;level: ColumnType<number, number, number>;}-export type SelectNodePath = Selectable<NodePathTable>;-export type CreateNodePath = Insertable<NodePathTable>;-export type UpdateNodePath = Updateable<NodePathTable>;--interface InteractionTable {- user_id: ColumnType<string, string, never>;- node_id: ColumnType<string, string, never>;- workspace_id: ColumnType<string, string, never>;- attributes: JSONColumnType<- InteractionAttributes,- string | null,- string | null- >;- created_at: ColumnType<Date, Date, never>;- updated_at: ColumnType<Date | null, Date | null, Date>;- server_created_at: ColumnType<Date, Date, never>;- server_updated_at: ColumnType<Date | null, Date | null, Date>;- version: ColumnType<bigint, never, never>;-}--export type SelectInteraction = Selectable<InteractionTable>;-export type CreateInteraction = Insertable<InteractionTable>;-export type UpdateInteraction = Updateable<InteractionTable>;+export type SelectEntryPath = Selectable<EntryPathTable>;+export type CreateEntryPath = Insertable<EntryPathTable>;+export type UpdateEntryPath = Updateable<EntryPathTable>;export interface DatabaseSchema {accounts: AccountTable;devices: DeviceTable;workspaces: WorkspaceTable;users: UserTable;- nodes: NodeTable;+ entries: EntryTable;transactions: TransactionTable;messages: MessageTable;message_reactions: MessageReactionTable;collaborations: CollaborationTable;files: FileTable;- node_paths: NodePathTable;- interactions: InteractionTable;+ entry_paths: EntryPathTable;}diff --git a/apps/server/src/jobs/clean-node-data.ts b/apps/server/src/jobs/clean-entry-data.tssimilarity index 73%rename from apps/server/src/jobs/clean-node-data.tsrename to apps/server/src/jobs/clean-entry-data.tsindex c42f3d6a..d224e08f 100644--- a/apps/server/src/jobs/clean-node-data.ts+++ b/apps/server/src/jobs/clean-entry-data.ts@@ -10,35 +10,35 @@ import { createLogger } from '@/lib/logger';const BATCH_SIZE = 100;-const logger = createLogger('clean-node-data');+const logger = createLogger('clean-entry-data');-export type CleanNodeDataInput = {- type: 'clean_node_data';- nodeId: string;+export type CleanEntryDataInput = {+ type: 'clean_entry_data';+ entryId: string;workspaceId: string;};declare module '@/types/jobs' {interface JobMap {- clean_node_data: {- input: CleanNodeDataInput;+ clean_entry_data: {+ input: CleanEntryDataInput;};}}-export const cleanNodeDataHandler: JobHandler<CleanNodeDataInput> = async (+export const cleanEntryDataHandler: JobHandler<CleanEntryDataInput> = async (input) => {- logger.trace(`Cleaning node data for ${input.nodeId}`);+ logger.trace(`Cleaning entry data for ${input.entryId}`);const deleteTransactions = await database.selectFrom('transactions').selectAll()- .where('node_id', '=', input.nodeId)+ .where('entry_id', '=', input.entryId).execute();if (deleteTransactions.length !== 1) {- logger.error(`Expected 1 delete transaction for ${input.nodeId}`);+ logger.error(`Expected 1 delete transaction for ${input.entryId}`);return;}@@ -47,20 +47,20 @@ export const cleanNodeDataHandler: JobHandler<CleanNodeDataInput> = async (!deleteTransaction?.operation ||deleteTransaction.operation !== 'delete') {- logger.error(`Expected delete transaction for ${input.nodeId}`);+ logger.error(`Expected delete transaction for ${input.entryId}`);return;}- const parentIds = [input.nodeId];+ const parentIds = [input.entryId];while (parentIds.length > 0) {const tempParentIds = parentIds.splice(0, BATCH_SIZE);- const deletedNodeIds = await deleteChildren(+ const deletedEntryIds = await deleteChildren(tempParentIds,input.workspaceId,deleteTransaction.created_by);- parentIds.push(...deletedNodeIds);+ parentIds.push(...deletedEntryIds);}};@@ -69,12 +69,12 @@ const deleteChildren = async (workspaceId: string,userId: string) => {- const deletedNodeIds: string[] = [];+ const deletedEntryIds: string[] = [];let hasMore = true;while (hasMore) {try {const descendants = await database- .selectFrom('nodes')+ .selectFrom('entries').selectAll().where('parent_id', 'in', parentIds).orderBy('id', 'asc')@@ -100,11 +100,11 @@ const deleteChildren = async (// .execute()// : [];- const nodeIds: string[] = descendants.map((d) => d.id);+ const entryIds: string[] = descendants.map((d) => d.id);const transactionsToCreate: CreateTransaction[] = descendants.map((descendant) => ({id: generateId(IdType.Transaction),- node_id: descendant.id,+ entry_id: descendant.id,root_id: descendant.root_id,workspace_id: workspaceId,operation: 'delete',@@ -118,7 +118,7 @@ const deleteChildren = async (await database.transaction().execute(async (trx) => {await trx.deleteFrom('transactions')- .where('node_id', 'in', nodeIds)+ .where('entry_id', 'in', entryIds).execute();const createdTransactions = await trx@@ -138,14 +138,14 @@ const deleteChildren = async (// .execute();// }- await trx.deleteFrom('nodes').where('id', 'in', nodeIds).execute();+ await trx.deleteFrom('entries').where('id', 'in', entryIds).execute();await trx.updateTable('collaborations').set({deleted_at: new Date(),deleted_by: userId,})- .where('node_id', 'in', nodeIds)+ .where('entry_id', 'in', entryIds).execute();});@@ -162,26 +162,26 @@ const deleteChildren = async (// await filesStorage.send(command);// }- for (const node of descendants) {- logger.trace(`Publishing node deleted event for ${node.id}`);+ for (const entry of descendants) {+ logger.trace(`Publishing entry deleted event for ${entry.id}`);eventBus.publish({- type: 'node_deleted',- nodeId: node.id,- nodeType: node.type,- rootId: node.root_id,+ type: 'entry_deleted',+ entryId: entry.id,+ entryType: entry.type,+ rootId: entry.root_id,workspaceId: workspaceId,});- deletedNodeIds.push(node.id);+ deletedEntryIds.push(entry.id);}hasMore = descendants.length === BATCH_SIZE;} catch (error) {- logger.error(`Error cleaning node data for ${parentIds}: ${error}`);+ logger.error(`Error cleaning entry data for ${parentIds}: ${error}`);hasMore = false;}}- return deletedNodeIds;+ return deletedEntryIds;};diff --git a/apps/server/src/jobs/index.ts b/apps/server/src/jobs/index.tsindex 6a2b03bf..a89f604b 100644--- a/apps/server/src/jobs/index.ts+++ b/apps/server/src/jobs/index.ts@@ -1,4 +1,4 @@-import { cleanNodeDataHandler } from '@/jobs/clean-node-data';+import { cleanEntryDataHandler } from '@/jobs/clean-entry-data';import { cleanWorkspaceDataHandler } from '@/jobs/clean-workspace-data';import { sendEmailHandler } from '@/jobs/send-email';import { JobHandler, JobMap } from '@/types/jobs';@@ -10,5 +10,5 @@ type JobHandlerMap = {export const jobHandlerMap: JobHandlerMap = {send_email: sendEmailHandler,clean_workspace_data: cleanWorkspaceDataHandler,- clean_node_data: cleanNodeDataHandler,+ clean_entry_data: cleanEntryDataHandler,};diff --git a/apps/server/src/lib/constants.ts b/apps/server/src/lib/constants.tsindex 0f9176ce..3b23dff2 100644--- a/apps/server/src/lib/constants.ts+++ b/apps/server/src/lib/constants.ts@@ -1,26 +1,26 @@-import { NodeRoles } from '@colanode/core';+import { EntryRoles } from '@colanode/core';export const hasAdminAccess = (role: string): boolean => {- return role === NodeRoles.Admin;+ return role === EntryRoles.Admin;};export const hasEditorAccess = (role: string): boolean => {- return role === NodeRoles.Admin || role === NodeRoles.Editor;+ return role === EntryRoles.Admin || role === EntryRoles.Editor;};export const hasCollaboratorAccess = (role: string): boolean => {return (- role === NodeRoles.Admin ||- role === NodeRoles.Editor ||- role === NodeRoles.Collaborator+ role === EntryRoles.Admin ||+ role === EntryRoles.Editor ||+ role === EntryRoles.Collaborator);};export const hasViewerAccess = (role: string): boolean => {return (- role === NodeRoles.Admin ||- role === NodeRoles.Editor ||- role === NodeRoles.Collaborator ||- role === NodeRoles.Viewer+ role === EntryRoles.Admin ||+ role === EntryRoles.Editor ||+ role === EntryRoles.Collaborator ||+ role === EntryRoles.Viewer);};diff --git a/apps/server/src/lib/entries.ts b/apps/server/src/lib/entries.tsnew file mode 100644index 00000000..156fdede--- /dev/null+++ b/apps/server/src/lib/entries.ts@@ -0,0 +1,116 @@+import {+ extractEntryCollaborators,+ extractEntryRole,+ Entry,+ EntryOutput,+ EntryRole,+ EntryType,+} from '@colanode/core';++import { database } from '@/data/database';+import { SelectEntry } from '@/data/schema';+import { EntryCollaborator } from '@/types/entries';++export const mapEntryOutput = (entry: SelectEntry): EntryOutput => {+ return {+ id: entry.id,+ parentId: entry.parent_id,+ workspaceId: entry.workspace_id,+ type: entry.type,+ attributes: entry.attributes,+ state: '',+ createdAt: entry.created_at.toISOString(),+ createdBy: entry.created_by,+ transactionId: entry.transaction_id,+ updatedAt: entry.updated_at?.toISOString() ?? null,+ updatedBy: entry.updated_by ?? null,+ };+};++export const mapEntry = (entry: SelectEntry): Entry => {+ return {+ id: entry.id,+ parentId: entry.parent_id,+ rootId: entry.root_id,+ type: entry.type as EntryType,+ attributes: entry.attributes,+ createdAt: entry.created_at.toISOString(),+ createdBy: entry.created_by,+ updatedAt: entry.updated_at?.toISOString() ?? null,+ updatedBy: entry.updated_by ?? null,+ transactionId: entry.transaction_id,+ } as Entry;+};++export const fetchEntry = async (+ entryId: string+): Promise<SelectEntry | null> => {+ const result = await database+ .selectFrom('entries')+ .selectAll()+ .where('id', '=', entryId)+ .executeTakeFirst();++ return result ?? null;+};++export const fetchEntryAncestors = async (+ entryId: string+): Promise<SelectEntry[]> => {+ const result = await database+ .selectFrom('entries')+ .selectAll()+ .innerJoin('entry_paths', 'entries.id', 'entry_paths.ancestor_id')+ .where('entry_paths.descendant_id', '=', entryId)+ .orderBy('entry_paths.level', 'desc')+ .execute();++ return result;+};++export const fetchEntryDescendants = async (+ entryId: string+): Promise<string[]> => {+ const result = await database+ .selectFrom('entry_paths')+ .select('descendant_id')+ .where('ancestor_id', '=', entryId)+ .orderBy('level', 'asc')+ .execute();++ return result.map((row) => row.descendant_id);+};++export const fetchEntryCollaborators = async (+ entryId: string+): Promise<EntryCollaborator[]> => {+ const ancestors = await fetchEntryAncestors(entryId);+ const collaboratorsMap = new Map<string, string>();++ for (const ancestor of ancestors) {+ const collaborators = extractEntryCollaborators(ancestor.attributes);+ for (const [collaboratorId, role] of Object.entries(collaborators)) {+ collaboratorsMap.set(collaboratorId, role);+ }+ }++ return Array.from(collaboratorsMap.entries()).map(+ ([collaboratorId, role]) => ({+ entryId: entryId,+ collaboratorId: collaboratorId,+ role: role,+ })+ );+};++export const fetchEntryRole = async (+ entryId: string,+ collaboratorId: string+): Promise<EntryRole | null> => {+ const ancestors = await fetchEntryAncestors(entryId);+ if (ancestors.length === 0) {+ return null;+ }++ return extractEntryRole(ancestors.map(mapEntry), collaboratorId);+};diff --git a/apps/server/src/lib/nodes.ts b/apps/server/src/lib/nodes.tsdeleted file mode 100644index 5af9e78f..00000000--- a/apps/server/src/lib/nodes.ts+++ /dev/null@@ -1,131 +0,0 @@-import {- extractNodeCollaborators,- extractNodeRole,- Node,- NodeOutput,- NodeRole,- NodeType,- ServerInteraction,-} from '@colanode/core';--import { database } from '@/data/database';-import { SelectInteraction, SelectNode } from '@/data/schema';-import { NodeCollaborator } from '@/types/nodes';--export const mapNodeOutput = (node: SelectNode): NodeOutput => {- return {- id: node.id,- parentId: node.parent_id,- workspaceId: node.workspace_id,- type: node.type,- attributes: node.attributes,- state: '',- createdAt: node.created_at.toISOString(),- createdBy: node.created_by,- transactionId: node.transaction_id,- updatedAt: node.updated_at?.toISOString() ?? null,- updatedBy: node.updated_by ?? null,- };-};--export const mapNode = (node: SelectNode): Node => {- return {- id: node.id,- parentId: node.parent_id,- rootId: node.root_id,- type: node.type as NodeType,- attributes: node.attributes,- createdAt: node.created_at.toISOString(),- createdBy: node.created_by,- updatedAt: node.updated_at?.toISOString() ?? null,- updatedBy: node.updated_by ?? null,- transactionId: node.transaction_id,- } as Node;-};--export const mapInteraction = (- interaction: SelectInteraction-): ServerInteraction => {- return {- userId: interaction.user_id,- nodeId: interaction.node_id,- workspaceId: interaction.workspace_id,- attributes: interaction.attributes,- createdAt: interaction.created_at.toISOString(),- updatedAt: interaction.updated_at?.toISOString() ?? null,- serverCreatedAt: interaction.server_created_at.toISOString(),- serverUpdatedAt: interaction.server_updated_at?.toISOString() ?? null,- version: interaction.version.toString(),- };-};--export const fetchNode = async (nodeId: string): Promise<SelectNode | null> => {- const result = await database- .selectFrom('nodes')- .selectAll()- .where('id', '=', nodeId)- .executeTakeFirst();-- return result ?? null;-};--export const fetchNodeAncestors = async (- nodeId: string-): Promise<SelectNode[]> => {- const result = await database- .selectFrom('nodes')- .selectAll()- .innerJoin('node_paths', 'nodes.id', 'node_paths.ancestor_id')- .where('node_paths.descendant_id', '=', nodeId)- .orderBy('node_paths.level', 'desc')- .execute();-- return result;-};--export const fetchNodeDescendants = async (- nodeId: string-): Promise<string[]> => {- const result = await database- .selectFrom('node_paths')- .select('descendant_id')- .where('ancestor_id', '=', nodeId)- .orderBy('level', 'asc')- .execute();-- return result.map((row) => row.descendant_id);-};--export const fetchNodeCollaborators = async (- nodeId: string-): Promise<NodeCollaborator[]> => {- const ancestors = await fetchNodeAncestors(nodeId);- const collaboratorsMap = new Map<string, string>();-- for (const ancestor of ancestors) {- const collaborators = extractNodeCollaborators(ancestor.attributes);- for (const [collaboratorId, role] of Object.entries(collaborators)) {- collaboratorsMap.set(collaboratorId, role);- }- }-- return Array.from(collaboratorsMap.entries()).map(- ([collaboratorId, role]) => ({- nodeId: nodeId,- collaboratorId: collaboratorId,- role: role,- })- );-};--export const fetchNodeRole = async (- nodeId: string,- collaboratorId: string-): Promise<NodeRole | null> => {- const ancestors = await fetchNodeAncestors(nodeId);- if (ancestors.length === 0) {- return null;- }-- return extractNodeRole(ancestors.map(mapNode), collaboratorId);-};diff --git a/apps/server/src/services/node-service.ts b/apps/server/src/services/entry-service.tssimilarity index 74%rename from apps/server/src/services/node-service.tsrename to apps/server/src/services/entry-service.tsindex 74fa17ce..8d4444bd 100644--- a/apps/server/src/services/node-service.ts+++ b/apps/server/src/services/entry-service.ts@@ -1,10 +1,10 @@import {- extractNodeCollaborators,+ extractEntryCollaborators,generateId,IdType,- NodeAttributes,- NodeMutationContext,- NodeRole,+ EntryAttributes,+ EntryMutationContext,+ EntryRole,registry,} from '@colanode/core';import { decodeState, YDoc } from '@colanode/crdt';@@ -14,7 +14,7 @@ import { cloneDeep } from 'lodash-es';import { jobService } from '@/services/job-service';import { database } from '@/data/database';import {- CreateNode,+ CreateEntry,CreateCollaboration,CreateTransaction,DatabaseSchema,@@ -22,7 +22,7 @@ import {SelectCollaboration,} from '@/data/schema';import { eventBus } from '@/lib/event-bus';-import { fetchNodeAncestors, mapNode } from '@/lib/nodes';+import { fetchEntryAncestors, mapEntry } from '@/lib/entries';import { createLogger } from '@/lib/logger';import {ApplyCreateTransactionInput,@@ -31,11 +31,11 @@ import {ApplyDeleteTransactionOutput,ApplyUpdateTransactionInput,ApplyUpdateTransactionOutput,- CreateNodeInput,- CreateNodeOutput,- UpdateNodeInput,- UpdateNodeOutput,-} from '@/types/nodes';+ CreateEntryInput,+ CreateEntryOutput,+ UpdateEntryInput,+ UpdateEntryOutput,+} from '@/types/entries';const UPDATE_RETRIES_LIMIT = 10;@@ -45,28 +45,28 @@ type UpdateResult<T> = {};type CollaboratorChangeResult = {- addedCollaborators: Record<string, NodeRole>;- updatedCollaborators: Record<string, NodeRole>;- removedCollaborators: Record<string, NodeRole>;+ addedCollaborators: Record<string, EntryRole>;+ updatedCollaborators: Record<string, EntryRole>;+ removedCollaborators: Record<string, EntryRole>;};-class NodeService {+class EntryService {private readonly logger = createLogger('node-service');- public async createNode(- input: CreateNodeInput- ): Promise<CreateNodeOutput | null> {+ public async createEntry(+ input: CreateEntryInput+ ): Promise<CreateEntryOutput | null> {const model = registry.getModel(input.attributes.type);const ydoc = new YDoc();const update = ydoc.updateAttributes(model.schema, input.attributes);- const attributes = ydoc.getAttributes<NodeAttributes>();+ const attributes = ydoc.getAttributes<EntryAttributes>();const attributesJson = JSON.stringify(attributes);const date = new Date();const transactionId = generateId(IdType.Transaction);- const createNode: CreateNode = {- id: input.nodeId,+ const createEntry: CreateEntry = {+ id: input.entryId,root_id: input.rootId,workspace_id: input.workspaceId,attributes: attributesJson,@@ -78,7 +78,7 @@ class NodeService {const createTransaction: CreateTransaction = {id: transactionId,root_id: input.rootId,- node_id: input.nodeId,+ entry_id: input.entryId,workspace_id: input.workspaceId,operation: 'create',data: update,@@ -88,17 +88,17 @@ class NodeService {};try {- const { createdNode, createdTransaction, createdCollaborations } =+ const { createdEntry, createdTransaction, createdCollaborations } =await this.applyDatabaseCreateTransaction(attributes,- createNode,+ createEntry,createTransaction);eventBus.publish({- type: 'node_created',- nodeId: input.nodeId,- nodeType: input.attributes.type,+ type: 'entry_created',+ entryId: input.entryId,+ entryType: input.attributes.type,rootId: input.rootId,workspaceId: input.workspaceId,});@@ -107,13 +107,13 @@ class NodeService {eventBus.publish({type: 'collaboration_created',collaboratorId: createdCollaboration.collaborator_id,- nodeId: input.nodeId,+ entryId: input.entryId,workspaceId: input.workspaceId,});}return {- node: createdNode,+ entry: createdEntry,transaction: createdTransaction,};} catch (error) {@@ -122,11 +122,11 @@ class NodeService {}}- public async updateNode(- input: UpdateNodeInput- ): Promise<UpdateNodeOutput | null> {+ public async updateEntry(+ input: UpdateEntryInput+ ): Promise<UpdateEntryOutput | null> {for (let count = 0; count < UPDATE_RETRIES_LIMIT; count++) {- const result = await this.tryUpdateNode(input);+ const result = await this.tryUpdateEntry(input);if (result.type === 'success') {return result.output;@@ -140,21 +140,21 @@ class NodeService {return null;}- private async tryUpdateNode(- input: UpdateNodeInput- ): Promise<UpdateResult<UpdateNodeOutput>> {- const ancestorRows = await fetchNodeAncestors(input.nodeId);- const ancestors = ancestorRows.map(mapNode);+ private async tryUpdateEntry(+ input: UpdateEntryInput+ ): Promise<UpdateResult<UpdateEntryOutput>> {+ const ancestorRows = await fetchEntryAncestors(input.entryId);+ const ancestors = ancestorRows.map(mapEntry);- const node = ancestors.find((ancestor) => ancestor.id === input.nodeId);- if (!node) {+ const entry = ancestors.find((ancestor) => ancestor.id === input.entryId);+ if (!entry) {return { type: 'error', output: null };}const previousTransactions = await database.selectFrom('transactions').selectAll()- .where('node_id', '=', input.nodeId)+ .where('entry_id', '=', input.entryId).orderBy('id', 'asc').execute();@@ -167,7 +167,7 @@ class NodeService {ydoc.applyUpdate(transaction.data);}- const currentAttributes = ydoc.getAttributes<NodeAttributes>();+ const currentAttributes = ydoc.getAttributes<EntryAttributes>();const updatedAttributes = input.updater(cloneDeep(currentAttributes));if (!updatedAttributes) {return { type: 'error', output: null };@@ -176,26 +176,26 @@ class NodeService {const model = registry.getModel(updatedAttributes.type);const update = ydoc.updateAttributes(model.schema, updatedAttributes);- const attributes = ydoc.getAttributes<NodeAttributes>();+ const attributes = ydoc.getAttributes<EntryAttributes>();const attributesJson = JSON.stringify(attributes);const date = new Date();const transactionId = generateId(IdType.Transaction);const collaboratorChanges = this.checkCollaboratorChanges(- node.attributes,+ entry.attributes,attributes);try {const {- updatedNode,+ updatedEntry,createdTransaction,createdCollaborations,updatedCollaborations,} = await database.transaction().execute(async (trx) => {- const updatedNode = await trx- .updateTable('nodes')+ const updatedEntry = await trx+ .updateTable('entries').returningAll().set({attributes: attributesJson,@@ -203,12 +203,12 @@ class NodeService {updated_by: input.userId,transaction_id: transactionId,})- .where('id', '=', input.nodeId)- .where('transaction_id', '=', node.transactionId)+ .where('id', '=', input.entryId)+ .where('transaction_id', '=', entry.transactionId).executeTakeFirst();- if (!updatedNode) {- throw new Error('Failed to update node');+ if (!updatedEntry) {+ throw new Error('Failed to update entry');}const createdTransaction = await trx@@ -216,8 +216,8 @@ class NodeService {.returningAll().values({id: transactionId,- node_id: input.nodeId,- root_id: node.rootId,+ entry_id: input.entryId,+ root_id: entry.rootId,workspace_id: input.workspaceId,operation: 'update',data: update,@@ -234,15 +234,15 @@ class NodeService {const { createdCollaborations, updatedCollaborations } =await this.applyCollaboratorUpdates(trx,- input.nodeId,- node.rootId,+ input.entryId,+ entry.rootId,input.userId,input.workspaceId,collaboratorChanges);return {- updatedNode,+ updatedEntry,createdTransaction,createdCollaborations,updatedCollaborations,@@ -250,10 +250,10 @@ class NodeService {});eventBus.publish({- type: 'node_updated',- nodeId: input.nodeId,- nodeType: node.type,- rootId: node.rootId,+ type: 'entry_updated',+ entryId: input.entryId,+ entryType: entry.type,+ rootId: entry.rootId,workspaceId: input.workspaceId,});@@ -261,7 +261,7 @@ class NodeService {eventBus.publish({type: 'collaboration_created',collaboratorId: createdCollaboration.collaborator_id,- nodeId: input.nodeId,+ entryId: input.entryId,workspaceId: input.workspaceId,});}@@ -270,7 +270,7 @@ class NodeService {eventBus.publish({type: 'collaboration_updated',collaboratorId: updatedCollaboration.collaborator_id,- nodeId: input.nodeId,+ entryId: input.entryId,workspaceId: input.workspaceId,});}@@ -278,7 +278,7 @@ class NodeService {return {type: 'success',output: {- node: updatedNode,+ entry: updatedEntry,transaction: createdTransaction,},};@@ -293,14 +293,14 @@ class NodeService {): Promise<ApplyCreateTransactionOutput | null> {const ydoc = new YDoc();ydoc.applyUpdate(input.data);- const attributes = ydoc.getAttributes<NodeAttributes>();+ const attributes = ydoc.getAttributes<EntryAttributes>();const ancestorRows = attributes.parentId- ? await fetchNodeAncestors(attributes.parentId)+ ? await fetchEntryAncestors(attributes.parentId): [];- const ancestors = ancestorRows.map(mapNode);- const context = new NodeMutationContext(+ const ancestors = ancestorRows.map(mapEntry);+ const context = new EntryMutationContext(user.account_id,user.workspace_id,user.id,@@ -317,8 +317,8 @@ class NodeService {return null;}- const createNode: CreateNode = {- id: input.nodeId,+ const createEntry: CreateEntry = {+ id: input.entryId,root_id: input.rootId,attributes: JSON.stringify(attributes),workspace_id: context.workspaceId,@@ -329,7 +329,7 @@ class NodeService {const createTransaction: CreateTransaction = {id: input.id,- node_id: input.nodeId,+ entry_id: input.entryId,root_id: input.rootId,workspace_id: context.workspaceId,operation: 'create',@@ -341,17 +341,17 @@ class NodeService {};try {- const { createdNode, createdTransaction, createdCollaborations } =+ const { createdEntry, createdTransaction, createdCollaborations } =await this.applyDatabaseCreateTransaction(attributes,- createNode,+ createEntry,createTransaction);eventBus.publish({- type: 'node_created',- nodeId: input.nodeId,- nodeType: attributes.type,+ type: 'entry_created',+ entryId: input.entryId,+ entryType: attributes.type,rootId: input.rootId,workspaceId: context.workspaceId,});@@ -360,13 +360,13 @@ class NodeService {eventBus.publish({type: 'collaboration_created',collaboratorId: createdCollaboration.collaborator_id,- nodeId: input.nodeId,+ entryId: input.entryId,workspaceId: context.workspaceId,});}return {- node: createdNode,+ entry: createdEntry,transaction: createdTransaction,};} catch (error) {@@ -398,18 +398,18 @@ class NodeService {user: SelectUser,input: ApplyUpdateTransactionInput): Promise<UpdateResult<ApplyUpdateTransactionOutput>> {- const ancestorRows = await fetchNodeAncestors(input.nodeId);- const ancestors = ancestorRows.map(mapNode);+ const ancestorRows = await fetchEntryAncestors(input.entryId);+ const ancestors = ancestorRows.map(mapEntry);- const node = ancestors.find((ancestor) => ancestor.id === input.nodeId);- if (!node) {+ const entry = ancestors.find((ancestor) => ancestor.id === input.entryId);+ if (!entry) {return { type: 'error', output: null };}const previousTransactions = await database.selectFrom('transactions').selectAll()- .where('node_id', '=', input.nodeId)+ .where('entry_id', '=', input.entryId).orderBy('version', 'asc').execute();@@ -424,14 +424,14 @@ class NodeService {ydoc.applyUpdate(input.data);- const attributes = ydoc.getAttributes<NodeAttributes>();+ const attributes = ydoc.getAttributes<EntryAttributes>();const attributesJson = JSON.stringify(attributes);const model = registry.getModel(attributes.type);if (!model.schema.safeParse(attributes).success) {return { type: 'error', output: null };}- const context = new NodeMutationContext(+ const context = new EntryMutationContext(user.account_id,user.workspace_id,user.id,@@ -439,24 +439,24 @@ class NodeService {ancestors);- if (!model.canUpdate(context, node, attributes)) {+ if (!model.canUpdate(context, entry, attributes)) {return { type: 'error', output: null };}const collaboratorChanges = this.checkCollaboratorChanges(- node.attributes,+ entry.attributes,attributes);try {const {- updatedNode,+ updatedEntry,createdTransaction,createdCollaborations,updatedCollaborations,} = await database.transaction().execute(async (trx) => {- const updatedNode = await trx- .updateTable('nodes')+ const updatedEntry = await trx+ .updateTable('entries').returningAll().set({attributes: attributesJson,@@ -464,12 +464,12 @@ class NodeService {updated_by: input.userId,transaction_id: input.id,})- .where('id', '=', input.nodeId)- .where('transaction_id', '=', node.transactionId)+ .where('id', '=', input.entryId)+ .where('transaction_id', '=', entry.transactionId).executeTakeFirst();- if (!updatedNode) {- throw new Error('Failed to update node');+ if (!updatedEntry) {+ throw new Error('Failed to update entry');}const createdTransaction = await trx@@ -477,7 +477,7 @@ class NodeService {.returningAll().values({id: input.id,- node_id: input.nodeId,+ entry_id: input.entryId,root_id: input.rootId,workspace_id: context.workspaceId,operation: 'update',@@ -498,7 +498,7 @@ class NodeService {const { createdCollaborations, updatedCollaborations } =await this.applyCollaboratorUpdates(trx,- input.nodeId,+ input.entryId,input.rootId,input.userId,context.workspaceId,@@ -506,7 +506,7 @@ class NodeService {);return {- updatedNode,+ updatedEntry,createdTransaction,createdCollaborations,updatedCollaborations,@@ -514,10 +514,10 @@ class NodeService {});eventBus.publish({- type: 'node_updated',- nodeId: input.nodeId,- nodeType: node.type,- rootId: node.rootId,+ type: 'entry_updated',+ entryId: input.entryId,+ entryType: entry.type,+ rootId: entry.rootId,workspaceId: context.workspaceId,});@@ -525,7 +525,7 @@ class NodeService {eventBus.publish({type: 'collaboration_created',collaboratorId: createdCollaboration.collaborator_id,- nodeId: input.nodeId,+ entryId: input.entryId,workspaceId: context.workspaceId,});}@@ -534,7 +534,7 @@ class NodeService {eventBus.publish({type: 'collaboration_updated',collaboratorId: updatedCollaboration.collaborator_id,- nodeId: input.nodeId,+ entryId: input.entryId,workspaceId: context.workspaceId,});}@@ -542,7 +542,7 @@ class NodeService {return {type: 'success',output: {- node: updatedNode,+ entry: updatedEntry,transaction: createdTransaction,},};@@ -555,15 +555,15 @@ class NodeService {user: SelectUser,input: ApplyDeleteTransactionInput): Promise<ApplyDeleteTransactionOutput | null> {- const ancestorRows = await fetchNodeAncestors(input.nodeId);- const ancestors = ancestorRows.map(mapNode);- const node = ancestors.find((ancestor) => ancestor.id === input.nodeId);- if (!node) {+ const ancestorRows = await fetchEntryAncestors(input.entryId);+ const ancestors = ancestorRows.map(mapEntry);+ const entry = ancestors.find((ancestor) => ancestor.id === input.entryId);+ if (!entry) {return null;}- const model = registry.getModel(node.attributes.type);- const context = new NodeMutationContext(+ const model = registry.getModel(entry.attributes.type);+ const context = new EntryMutationContext(user.account_id,user.workspace_id,user.id,@@ -571,25 +571,25 @@ class NodeService {ancestors);- if (!model.canDelete(context, node)) {+ if (!model.canDelete(context, entry)) {return null;}- const { deletedNode, createdTransaction, updatedCollaborations } =+ const { deletedEntry, createdTransaction, updatedCollaborations } =await database.transaction().execute(async (trx) => {- const deletedNode = await trx- .deleteFrom('nodes')+ const deletedEntry = await trx+ .deleteFrom('entries').returningAll()- .where('id', '=', input.nodeId)+ .where('id', '=', input.entryId).executeTakeFirst();- if (!deletedNode) {- throw new Error('Failed to delete node');+ if (!deletedEntry) {+ throw new Error('Failed to delete entry');}await trx.deleteFrom('transactions')- .where('node_id', '=', input.nodeId)+ .where('entry_id', '=', input.entryId).execute();const createdTransaction = await trx@@ -597,7 +597,7 @@ class NodeService {.returningAll().values({id: input.id,- node_id: input.nodeId,+ entry_id: input.entryId,root_id: input.rootId,workspace_id: user.workspace_id,operation: 'delete',@@ -618,21 +618,21 @@ class NodeService {deleted_by: user.id,}).returningAll()- .where('node_id', '=', input.nodeId)+ .where('entry_id', '=', input.entryId).execute();return {- deletedNode,+ deletedEntry,createdTransaction,updatedCollaborations,};});eventBus.publish({- type: 'node_deleted',- nodeId: input.nodeId,- nodeType: node.type,- rootId: node.rootId,+ type: 'entry_deleted',+ entryId: input.entryId,+ entryType: entry.type,+ rootId: entry.rootId,workspaceId: user.workspace_id,});@@ -640,48 +640,48 @@ class NodeService {eventBus.publish({type: 'collaboration_updated',collaboratorId: updatedCollaboration.collaborator_id,- nodeId: input.nodeId,+ entryId: input.entryId,workspaceId: user.workspace_id,});}await jobService.addJob({- type: 'clean_node_data',- nodeId: input.nodeId,+ type: 'clean_entry_data',+ entryId: input.entryId,workspaceId: user.workspace_id,});return {- node: deletedNode,+ entry: deletedEntry,transaction: createdTransaction,};}private async applyDatabaseCreateTransaction(- attributes: NodeAttributes,- node: CreateNode,+ attributes: EntryAttributes,+ entry: CreateEntry,transaction: CreateTransaction) {const collaborationsToCreate: CreateCollaboration[] = Object.entries(- extractNodeCollaborators(attributes)+ extractEntryCollaborators(attributes)).map(([userId, role]) => ({collaborator_id: userId,- node_id: node.id,- workspace_id: node.workspace_id,+ entry_id: entry.id,+ workspace_id: entry.workspace_id,role,created_at: new Date(),created_by: transaction.created_by,}));return await database.transaction().execute(async (trx) => {- const createdNode = await trx- .insertInto('nodes')+ const createdEntry = await trx+ .insertInto('entries').returningAll()- .values(node)+ .values(entry).executeTakeFirst();- if (!createdNode) {- throw new Error('Failed to create node');+ if (!createdEntry) {+ throw new Error('Failed to create entry');}const createdTransaction = await trx@@ -705,16 +705,16 @@ class NodeService {throw new Error('Failed to create collaborations');}- return { createdNode, createdTransaction, createdCollaborations };+ return { createdEntry, createdTransaction, createdCollaborations };}- return { createdNode, createdTransaction, createdCollaborations: [] };+ return { createdEntry, createdTransaction, createdCollaborations: [] };});}private async applyCollaboratorUpdates(transaction: Transaction<DatabaseSchema>,- nodeId: string,+ entryId: string,rootId: string,userId: string,workspaceId: string,@@ -731,14 +731,14 @@ class NodeService {.returningAll().values({collaborator_id: collaboratorId,- node_id: nodeId,+ entry_id: entryId,workspace_id: workspaceId,role,created_at: new Date(),created_by: userId,}).onConflict((oc) =>- oc.columns(['collaborator_id', 'node_id']).doUpdateSet({+ oc.columns(['collaborator_id', 'entry_id']).doUpdateSet({role,updated_at: new Date(),updated_by: userId,@@ -769,7 +769,7 @@ class NodeService {deleted_by: null,}).where('collaborator_id', '=', collaboratorId)- .where('node_id', '=', nodeId)+ .where('entry_id', '=', entryId).executeTakeFirst();if (!updatedCollaboration) {@@ -792,7 +792,7 @@ class NodeService {deleted_by: userId,}).where('collaborator_id', 'in', removedCollaboratorIds)- .where('node_id', '=', nodeId)+ .where('entry_id', '=', entryId).execute();if (removedCollaborations.length !== removedCollaboratorIds.length) {@@ -806,15 +806,15 @@ class NodeService {}private checkCollaboratorChanges(- beforeAttributes: NodeAttributes,- afterAttributes: NodeAttributes+ beforeAttributes: EntryAttributes,+ afterAttributes: EntryAttributes): CollaboratorChangeResult {- const beforeCollaborators = extractNodeCollaborators(beforeAttributes);- const afterCollaborators = extractNodeCollaborators(afterAttributes);+ const beforeCollaborators = extractEntryCollaborators(beforeAttributes);+ const afterCollaborators = extractEntryCollaborators(afterAttributes);- const addedCollaborators: Record<string, NodeRole> = {};- const updatedCollaborators: Record<string, NodeRole> = {};- const removedCollaborators: Record<string, NodeRole> = {};+ const addedCollaborators: Record<string, EntryRole> = {};+ const updatedCollaborators: Record<string, EntryRole> = {};+ const removedCollaborators: Record<string, EntryRole> = {};// Check for added and updated collaboratorsfor (const [userId, newRole] of Object.entries(afterCollaborators)) {@@ -840,4 +840,4 @@ class NodeService {}}-export const nodeService = new NodeService();+export const entryService = new EntryService();diff --git a/apps/server/src/services/file-service.ts b/apps/server/src/services/file-service.tsindex 13557e9a..9627f22e 100644--- a/apps/server/src/services/file-service.ts+++ b/apps/server/src/services/file-service.ts@@ -1,13 +1,13 @@import {CreateFileMutation,- extractNodeRole,+ extractEntryRole,FileStatus,hasCollaboratorAccess,} from '@colanode/core';import { database } from '@/data/database';import { SelectUser } from '@/data/schema';-import { mapNode } from '@/lib/nodes';+import { mapEntry } from '@/lib/entries';import { eventBus } from '@/lib/event-bus';class FileService {@@ -25,7 +25,7 @@ class FileService {}const root = await database- .selectFrom('nodes')+ .selectFrom('entries').selectAll().where('id', '=', mutation.data.rootId).executeTakeFirst();@@ -34,8 +34,8 @@ class FileService {return false;}- const rootNode = mapNode(root);- const role = extractNodeRole(rootNode, user.id);+ const rootEntry = mapEntry(root);+ const role = extractEntryRole(rootEntry, user.id);if (!hasCollaboratorAccess(role)) {return false;}@@ -47,6 +47,7 @@ class FileService {id: mutation.data.id,type: mutation.data.type,parent_id: mutation.data.parentId,+ entry_id: mutation.data.entryId,root_id: mutation.data.rootId,workspace_id: root.workspace_id,name: mutation.data.name,diff --git a/apps/server/src/services/interaction-service.ts b/apps/server/src/services/interaction-service.tsindex a50f95c0..37b83e01 100644--- a/apps/server/src/services/interaction-service.ts+++ b/apps/server/src/services/interaction-service.ts@@ -1,153 +1,152 @@-import {- InteractionAttributes,- InteractionEvent,- mergeInteractionAttributes,- SyncInteractionsMessage,-} from '@colanode/core';--import { database } from '@/data/database';-import { eventBus } from '@/lib/event-bus';--const UPDATE_RETRIES_COUNT = 10;--class InteractionService {- public async syncLocalInteractions(- accountId: string,- message: SyncInteractionsMessage- ) {- const user = await database- .selectFrom('users')- .selectAll()- .where('id', '=', message.userId)- .executeTakeFirst();-- if (!user || user.account_id !== accountId) {- return false;- }-- for (let i = 0; i < UPDATE_RETRIES_COUNT; i++) {- const synced = await this.trySyncInteraction(user.workspace_id, message);-- if (synced) {- return true;- }- }-- return false;- }-- private async trySyncInteraction(- workspaceId: string,- message: SyncInteractionsMessage- ): Promise<boolean> {- if (message.events.length === 0) {- return true;- }-- const firstEvent = message.events[0];- if (!firstEvent) {- return true;- }-- const lastEvent = message.events[message.events.length - 1];- if (!lastEvent) {- return true;- }-- const interaction = await database- .selectFrom('interactions')- .selectAll()- .where('user_id', '=', message.userId)- .where('node_id', '=', message.nodeId)- .executeTakeFirst();-- const attributes = this.buildInteractionAttributes(- interaction?.attributes,- message.events- );-- if (!attributes) {- return true;- }-- if (interaction) {- const updatedInteraction = await database- .updateTable('interactions')- .returningAll()- .set({- attributes: JSON.stringify(attributes),- updated_at: new Date(lastEvent.createdAt),- server_updated_at: new Date(),- })- .where('user_id', '=', message.userId)- .where('node_id', '=', message.nodeId)- .where('version', '=', interaction.version)- .executeTakeFirst();-- if (updatedInteraction) {- eventBus.publish({- type: 'interaction_updated',- userId: message.userId,- nodeId: message.nodeId,- rootId: message.rootId,- workspaceId,- });-- return true;- }- }-- const createdInteraction = await database- .insertInto('interactions')- .returningAll()- .values({- user_id: message.userId,- node_id: message.nodeId,- workspace_id: workspaceId,- attributes: JSON.stringify(attributes),- created_at: new Date(firstEvent.createdAt),- server_created_at: new Date(),- })- .onConflict((oc) => oc.columns(['user_id', 'node_id']).doNothing())- .executeTakeFirst();-- if (createdInteraction) {- eventBus.publish({- type: 'interaction_updated',- userId: message.userId,- nodeId: message.nodeId,- rootId: message.rootId,- workspaceId,- });-- return true;- }-- return false;- }-- private buildInteractionAttributes(- attributes: InteractionAttributes | undefined,- events: InteractionEvent[]- ): InteractionAttributes | null {- if (events.length === 0) {- return null;- }-- let result = { ...attributes };- for (const event of events) {- const merged = mergeInteractionAttributes(- result,- event.attribute,- event.value- );- if (merged) {- result = merged;- }- }-- return result;- }-}--export const interactionService = new InteractionService();+// import {+// InteractionAttributes,+// InteractionEvent,+// mergeInteractionAttributes,+// } from '@colanode/core';++// import { database } from '@/data/database';++// const UPDATE_RETRIES_COUNT = 10;++// class InteractionService {+// public async syncLocalInteractions(+// accountId: string,+// message: SyncInteractionsMessage+// ) {+// const user = await database+// .selectFrom('users')+// .selectAll()+// .where('id', '=', message.userId)+// .executeTakeFirst();++// if (!user || user.account_id !== accountId) {+// return false;+// }++// for (let i = 0; i < UPDATE_RETRIES_COUNT; i++) {+// const synced = await this.trySyncInteraction(user.workspace_id, message);++// if (synced) {+// return true;+// }+// }++// return false;+// }++// private async trySyncInteraction(+// _: string,+// __: SyncInteractionsMessage+// ): Promise<boolean> {+// return true;+// // if (message.events.length === 0) {+// // return true;+// // }++// // const firstEvent = message.events[0];+// // if (!firstEvent) {+// // return true;+// // }++// // const lastEvent = message.events[message.events.length - 1];+// // if (!lastEvent) {+// // return true;+// // }++// // const interaction = await database+// // .selectFrom('interactions')+// // .selectAll()+// // .where('user_id', '=', message.userId)+// // .where('node_id', '=', message.nodeId)+// // .executeTakeFirst();++// // const attributes = this.buildInteractionAttributes(+// // interaction?.attributes,+// // message.events+// // );++// // if (!attributes) {+// // return true;+// // }++// // if (interaction) {+// // const updatedInteraction = await database+// // .updateTable('interactions')+// // .returningAll()+// // .set({+// // attributes: JSON.stringify(attributes),+// // updated_at: new Date(lastEvent.createdAt),+// // server_updated_at: new Date(),+// // })+// // .where('user_id', '=', message.userId)+// // .where('node_id', '=', message.nodeId)+// // .where('version', '=', interaction.version)+// // .executeTakeFirst();++// // if (updatedInteraction) {+// // eventBus.publish({+// // type: 'interaction_updated',+// // userId: message.userId,+// // nodeId: message.nodeId,+// // rootId: message.rootId,+// // workspaceId,+// // });++// // return true;+// // }+// // }++// // const createdInteraction = await database+// // .insertInto('interactions')+// // .returningAll()+// // .values({+// // user_id: message.userId,+// // node_id: message.nodeId,+// // workspace_id: workspaceId,+// // attributes: JSON.stringify(attributes),+// // created_at: new Date(firstEvent.createdAt),+// // server_created_at: new Date(),+// // })+// // .onConflict((oc) => oc.columns(['user_id', 'node_id']).doNothing())+// // .executeTakeFirst();++// // if (createdInteraction) {+// // eventBus.publish({+// // type: 'interaction_updated',+// // userId: message.userId,+// // nodeId: message.nodeId,+// // rootId: message.rootId,+// // workspaceId,+// // });++// // return true;+// // }++// // return false;+// }++// private buildInteractionAttributes(+// attributes: InteractionAttributes | undefined,+// events: InteractionEvent[]+// ): InteractionAttributes | null {+// if (events.length === 0) {+// return null;+// }++// let result = { ...attributes };+// for (const event of events) {+// const merged = mergeInteractionAttributes(+// result,+// event.attribute,+// event.value+// );+// if (merged) {+// result = merged;+// }+// }++// return result;+// }+// }++// export const interactionService = new InteractionService();diff --git a/apps/server/src/services/message-service.ts b/apps/server/src/services/message-service.tsindex 6d4e6071..b97de55d 100644--- a/apps/server/src/services/message-service.ts+++ b/apps/server/src/services/message-service.ts@@ -2,13 +2,13 @@ import {CreateMessageMutation,CreateMessageReactionMutation,DeleteMessageReactionMutation,- extractNodeRole,+ extractEntryRole,hasCollaboratorAccess,} from '@colanode/core';import { database } from '@/data/database';import { SelectUser } from '@/data/schema';-import { mapNode } from '@/lib/nodes';+import { mapEntry } from '@/lib/entries';import { eventBus } from '@/lib/event-bus';class MessageService {@@ -26,7 +26,7 @@ class MessageService {}const root = await database- .selectFrom('nodes')+ .selectFrom('entries').selectAll().where('id', '=', mutation.data.rootId).executeTakeFirst();@@ -35,8 +35,8 @@ class MessageService {return false;}- const rootNode = mapNode(root);- const role = extractNodeRole(rootNode, user.id);+ const rootEntry = mapEntry(root);+ const role = extractEntryRole(rootEntry, user.id);if (!hasCollaboratorAccess(role)) {return false;}@@ -47,7 +47,7 @@ class MessageService {.values({id: mutation.data.id,type: mutation.data.type,- node_id: mutation.data.nodeId,+ entry_id: mutation.data.entryId,parent_id: mutation.data.parentId,root_id: mutation.data.rootId,workspace_id: root.workspace_id,@@ -86,7 +86,7 @@ class MessageService {}const root = await database- .selectFrom('nodes')+ .selectFrom('entries').selectAll().where('id', '=', message.root_id).executeTakeFirst();@@ -95,8 +95,8 @@ class MessageService {return false;}- const rootNode = mapNode(root);- const role = extractNodeRole(rootNode, user.id);+ const rootEntry = mapEntry(root);+ const role = extractEntryRole(rootEntry, user.id);if (!hasCollaboratorAccess(role)) {return false;}@@ -150,7 +150,7 @@ class MessageService {}const root = await database- .selectFrom('nodes')+ .selectFrom('entries').selectAll().where('id', '=', message.root_id).executeTakeFirst();@@ -159,8 +159,8 @@ class MessageService {return false;}- const rootNode = mapNode(root);- const role = extractNodeRole(rootNode, user.id);+ const rootEntry = mapEntry(root);+ const role = extractEntryRole(rootEntry, user.id);if (!hasCollaboratorAccess(role)) {return false;}diff --git a/apps/server/src/services/socket-connection.ts b/apps/server/src/services/socket-connection.tsindex c504de4d..f4ddd01e 100644--- a/apps/server/src/services/socket-connection.ts+++ b/apps/server/src/services/socket-connection.ts@@ -6,7 +6,6 @@ import {WorkspaceStatus,} from '@colanode/core';-import { interactionService } from '@/services/interaction-service';import { createLogger } from '@/lib/logger';import { RequestAccount } from '@/types/api';import { database } from '@/data/database';@@ -73,8 +72,6 @@ export class SocketConnection {if (message.type === 'synchronizer_input') {this.handleSynchronizerInput(message);- } else if (message.type === 'sync_interactions') {- interactionService.syncLocalInteractions(this.account.id, message);}}@@ -238,7 +235,7 @@ export class SocketConnection {continue;}- rootIds.add(collaboration.node_id);+ rootIds.add(collaboration.entry_id);}const socketUser: SocketUser = {@@ -298,7 +295,7 @@ export class SocketConnection {return;}- user.rootIds.add(event.nodeId);+ user.rootIds.add(event.entryId);}private async handleCollaborationUpdatedEvent(@@ -313,13 +310,13 @@ export class SocketConnection {.selectFrom('collaborations').selectAll().where('collaborator_id', '=', event.collaboratorId)- .where('node_id', '=', event.nodeId)+ .where('entry_id', '=', event.entryId).executeTakeFirst();if (!collaboration || collaboration.deleted_at) {- user.rootIds.delete(event.nodeId);+ user.rootIds.delete(event.entryId);} else {- user.rootIds.add(event.nodeId);+ user.rootIds.add(event.entryId);}}}diff --git a/apps/server/src/services/workspace-service.ts b/apps/server/src/services/workspace-service.tsindex 48031fc2..23d40fe2 100644--- a/apps/server/src/services/workspace-service.ts+++ b/apps/server/src/services/workspace-service.ts@@ -9,8 +9,8 @@ import {import { database } from '@/data/database';import { SelectAccount } from '@/data/schema';-import { mapNode } from '@/lib/nodes';-import { nodeService } from '@/services/node-service';+import { mapEntry } from '@/lib/entries';+import { entryService } from '@/services/entry-service';import { eventBus } from '@/lib/event-bus';class WorkspaceService {@@ -63,8 +63,8 @@ class WorkspaceService {throw new Error('Failed to create workspace user.');}- const createSpaceNodeOutput = await nodeService.createNode({- nodeId: spaceId,+ const createSpaceEntryOutput = await entryService.createEntry({+ entryId: spaceId,rootId: spaceId,attributes: {type: 'space',@@ -80,10 +80,10 @@ class WorkspaceService {ancestors: [],});- if (createSpaceNodeOutput) {- const spaceNode = mapNode(createSpaceNodeOutput.node);- await nodeService.createNode({- nodeId: generateId(IdType.Page),+ if (createSpaceEntryOutput) {+ const spaceEntry = mapEntry(createSpaceEntryOutput.entry);+ await entryService.createEntry({+ entryId: generateId(IdType.Page),rootId: spaceId,attributes: {type: 'page',@@ -93,11 +93,11 @@ class WorkspaceService {},userId: userId,workspaceId: workspaceId,- ancestors: [spaceNode],+ ancestors: [spaceEntry],});- await nodeService.createNode({- nodeId: generateId(IdType.Channel),+ await entryService.createEntry({+ entryId: generateId(IdType.Channel),rootId: spaceId,attributes: {type: 'channel',@@ -106,7 +106,7 @@ class WorkspaceService {},userId: userId,workspaceId: workspaceId,- ancestors: [spaceNode],+ ancestors: [spaceEntry],});}diff --git a/apps/server/src/synchronizers/collaborations.ts b/apps/server/src/synchronizers/collaborations.tsindex 9a36fed8..73b73ed1 100644--- a/apps/server/src/synchronizers/collaborations.ts+++ b/apps/server/src/synchronizers/collaborations.ts@@ -59,7 +59,7 @@ export class CollaborationSynchronizer extends BaseSynchronizer<SyncCollaboratio): SynchronizerOutputMessage<SyncCollaborationsInput> {const items: SyncCollaborationData[] = unsyncedCollaborations.map((collaboration) => ({- nodeId: collaboration.node_id,+ entryId: collaboration.entry_id,workspaceId: collaboration.workspace_id,collaboratorId: collaboration.collaborator_id,role: collaboration.role,diff --git a/apps/server/src/synchronizers/files.ts b/apps/server/src/synchronizers/files.tsindex c91cf1b8..9a76ec71 100644--- a/apps/server/src/synchronizers/files.ts+++ b/apps/server/src/synchronizers/files.ts@@ -60,6 +60,7 @@ export class FileSynchronizer extends BaseSynchronizer<SyncFilesInput> {id: file.id,type: file.type,parentId: file.parent_id,+ entryId: file.entry_id,rootId: file.root_id,workspaceId: file.workspace_id,name: file.name,diff --git a/apps/server/src/synchronizers/messages.ts b/apps/server/src/synchronizers/messages.tsindex aa459d14..4d0d579c 100644--- a/apps/server/src/synchronizers/messages.ts+++ b/apps/server/src/synchronizers/messages.ts@@ -59,7 +59,7 @@ export class MessageSynchronizer extends BaseSynchronizer<SyncMessagesInput> {const items: SyncMessageData[] = unsyncedMessages.map((message) => ({id: message.id,type: message.type,- nodeId: message.node_id,+ entryId: message.entry_id,parentId: message.parent_id,rootId: message.root_id,workspaceId: message.workspace_id,diff --git a/apps/server/src/synchronizers/transactions.ts b/apps/server/src/synchronizers/transactions.tsindex e512c838..6d080b2e 100644--- a/apps/server/src/synchronizers/transactions.ts+++ b/apps/server/src/synchronizers/transactions.ts@@ -63,7 +63,7 @@ export class TransactionSynchronizer extends BaseSynchronizer<SyncTransactionsInreturn {id: transaction.id,operation: 'create',- nodeId: transaction.node_id,+ entryId: transaction.entry_id,rootId: transaction.root_id,workspaceId: transaction.workspace_id,data: encodeState(transaction.data),@@ -78,7 +78,7 @@ export class TransactionSynchronizer extends BaseSynchronizer<SyncTransactionsInreturn {id: transaction.id,operation: 'update',- nodeId: transaction.node_id,+ entryId: transaction.entry_id,rootId: transaction.root_id,workspaceId: transaction.workspace_id,data: encodeState(transaction.data),@@ -93,7 +93,7 @@ export class TransactionSynchronizer extends BaseSynchronizer<SyncTransactionsInreturn {id: transaction.id,operation: 'delete',- nodeId: transaction.node_id,+ entryId: transaction.entry_id,rootId: transaction.root_id,workspaceId: transaction.workspace_id,createdAt: transaction.created_at.toISOString(),diff --git a/apps/server/src/types/nodes.ts b/apps/server/src/types/entries.tssimilarity index 57%rename from apps/server/src/types/nodes.tsrename to apps/server/src/types/entries.tsindex eec25027..5dae443e 100644--- a/apps/server/src/types/nodes.ts+++ b/apps/server/src/types/entries.ts@@ -1,55 +1,55 @@-import { Node, NodeAttributes } from '@colanode/core';+import { Entry, EntryAttributes } from '@colanode/core';-import { SelectNode, SelectTransaction } from '@/data/schema';+import { SelectEntry, SelectTransaction } from '@/data/schema';-export type NodeCollaborator = {- nodeId: string;+export type EntryCollaborator = {+ entryId: string;collaboratorId: string;role: string;};-export type CreateNodeInput = {- nodeId: string;+export type CreateEntryInput = {+ entryId: string;rootId: string;- attributes: NodeAttributes;+ attributes: EntryAttributes;userId: string;workspaceId: string;- ancestors: Node[];+ ancestors: Entry[];};-export type CreateNodeOutput = {- node: SelectNode;+export type CreateEntryOutput = {+ entry: SelectEntry;transaction: SelectTransaction;};-export type UpdateNodeInput = {- nodeId: string;+export type UpdateEntryInput = {+ entryId: string;userId: string;workspaceId: string;- updater: (attributes: NodeAttributes) => NodeAttributes | null;+ updater: (attributes: EntryAttributes) => EntryAttributes | null;};-export type UpdateNodeOutput = {- node: SelectNode;+export type UpdateEntryOutput = {+ entry: SelectEntry;transaction: SelectTransaction;};export type ApplyCreateTransactionInput = {id: string;- nodeId: string;+ entryId: string;rootId: string;data: string | Uint8Array;createdAt: Date;};export type ApplyCreateTransactionOutput = {- node: SelectNode;+ entry: SelectEntry;transaction: SelectTransaction;};export type ApplyUpdateTransactionInput = {id: string;- nodeId: string;+ entryId: string;rootId: string;userId: string;data: string | Uint8Array;@@ -57,18 +57,18 @@ export type ApplyUpdateTransactionInput = {};export type ApplyUpdateTransactionOutput = {- node: SelectNode;+ entry: SelectEntry;transaction: SelectTransaction;};export type ApplyDeleteTransactionInput = {id: string;- nodeId: string;+ entryId: string;rootId: string;createdAt: Date;};export type ApplyDeleteTransactionOutput = {- node: SelectNode;+ entry: SelectEntry;transaction: SelectTransaction;};diff --git a/apps/server/src/types/events.ts b/apps/server/src/types/events.tsindex 1b524e0b..f52b758a 100644--- a/apps/server/src/types/events.ts+++ b/apps/server/src/types/events.ts@@ -1,25 +1,25 @@-import { NodeType } from '@colanode/core';+import { EntryType } from '@colanode/core';-export type NodeCreatedEvent = {- type: 'node_created';- nodeId: string;- nodeType: NodeType;+export type EntryCreatedEvent = {+ type: 'entry_created';+ entryId: string;+ entryType: EntryType;rootId: string;workspaceId: string;};-export type NodeUpdatedEvent = {- type: 'node_updated';- nodeId: string;- nodeType: NodeType;+export type EntryUpdatedEvent = {+ type: 'entry_updated';+ entryId: string;+ entryType: EntryType;rootId: string;workspaceId: string;};-export type NodeDeletedEvent = {- type: 'node_deleted';- nodeId: string;- nodeType: NodeType;+export type EntryDeletedEvent = {+ type: 'entry_deleted';+ entryId: string;+ entryType: EntryType;rootId: string;workspaceId: string;};@@ -64,14 +64,14 @@ export type MessageReactionDeletedEvent = {export type CollaborationCreatedEvent = {type: 'collaboration_created';collaboratorId: string;- nodeId: string;+ entryId: string;workspaceId: string;};export type CollaborationUpdatedEvent = {type: 'collaboration_updated';collaboratorId: string;- nodeId: string;+ entryId: string;workspaceId: string;};@@ -99,7 +99,7 @@ export type FileDeletedEvent = {export type InteractionUpdatedEvent = {type: 'interaction_updated';userId: string;- nodeId: string;+ entryId: string;rootId: string;workspaceId: string;};@@ -145,9 +145,9 @@ export type DeviceDeletedEvent = {};export type Event =- | NodeCreatedEvent- | NodeUpdatedEvent- | NodeDeletedEvent+ | EntryCreatedEvent+ | EntryUpdatedEvent+ | EntryDeletedEvent| CollaborationCreatedEvent| CollaborationUpdatedEvent| InteractionUpdatedEventdiff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex 22197cdc..59644dde 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -2,7 +2,6 @@ export * from './lib/constants';export * from './lib/files';export * from './lib/id';export * from './lib/interactions';-export * from './lib/nodes';export * from './lib/utils';export * from './registry/block';export * from './registry/channel';@@ -20,7 +19,7 @@ export * from './types/accounts';export * from './types/files';export * from './types/interactions';export * from './types/sockets';-export * from './types/nodes';+export * from './types/entries';export * from './types/servers';export * from './types/sync';export * from './types/workspaces';@@ -28,3 +27,4 @@ export * from './lib/blocks';export * from './types/mutations';export * from './types/messages';export * from './synchronizers';+export * from './lib/entries';diff --git a/packages/core/src/lib/blocks.ts b/packages/core/src/lib/blocks.tsindex 07e8bfc3..9ba1d7ae 100644--- a/packages/core/src/lib/blocks.ts+++ b/packages/core/src/lib/blocks.ts@@ -34,13 +34,13 @@ const collectText = (};export const extractText = (- nodeId: string,+ entryId: string,blocks: Record<string, Block> | undefined | null): string | null => {if (!blocks) {return null;}- const result = collectText(nodeId, blocks);+ const result = collectText(entryId, blocks);return result.length > 0 ? result : null;};diff --git a/packages/core/src/lib/constants.ts b/packages/core/src/lib/constants.tsindex dcb12f22..cb99e0e4 100644--- a/packages/core/src/lib/constants.ts+++ b/packages/core/src/lib/constants.ts@@ -1,18 +1,3 @@-export const NodeTypes = {- User: 'user',- Space: 'space',- Workspace: 'workspace',- Page: 'page',- Channel: 'channel',- Chat: 'chat',- Message: 'message',- Database: 'database',- DatabaseReplica: 'databaseReplica',- Record: 'record',- Folder: 'folder',- File: 'file',-};-export const EditorNodeTypes = {Paragraph: 'paragraph',Heading1: 'heading1',@@ -34,7 +19,7 @@ export const EditorNodeTypes = {export type SortDirection = 'asc' | 'desc';-export const NodeRoles = {+export const EntryRoles = {Admin: 'admin',Editor: 'editor',Collaborator: 'collaborator',diff --git a/packages/core/src/lib/nodes.ts b/packages/core/src/lib/entries.tssimilarity index 55%rename from packages/core/src/lib/nodes.tsrename to packages/core/src/lib/entries.tsindex 723cff73..04dd0114 100644--- a/packages/core/src/lib/nodes.ts+++ b/packages/core/src/lib/entries.ts@@ -1,17 +1,17 @@import { generateKeyBetween } from 'fractional-indexing-jittered';-import { Node, NodeAttributes, NodeRole } from '../index';+import { Entry, EntryAttributes, EntryRole } from '../index';-export const extractNodeCollaborators = (- attributes: NodeAttributes | NodeAttributes[]-): Record<string, NodeRole> => {+export const extractEntryCollaborators = (+ attributes: EntryAttributes | EntryAttributes[]+): Record<string, EntryRole> => {const items = Array.isArray(attributes) ? attributes : [attributes];- const collaborators: Record<string, NodeRole> = {};+ const collaborators: Record<string, EntryRole> = {};for (const item of items) {if ('collaborators' in item && item.collaborators) {for (const [collaboratorId, role] of Object.entries(item.collaborators)) {- collaborators[collaboratorId] = role as NodeRole;+ collaborators[collaboratorId] = role as EntryRole;}}}@@ -19,7 +19,9 @@ export const extractNodeCollaborators = (return collaborators;};-export const extractNodeName = (attributes: NodeAttributes): string | null => {+export const extractEntryName = (+ attributes: EntryAttributes+): string | null => {if ('name' in attributes && attributes.name) {return attributes.name as string;}@@ -27,14 +29,14 @@ export const extractNodeName = (attributes: NodeAttributes): string | null => {return null;};-export const extractNodeRole = (- tree: Node | Node[],+export const extractEntryRole = (+ tree: Entry | Entry[],collaboratorId: string-): NodeRole | null => {- const nodes = Array.isArray(tree) ? tree : [tree];- let role: NodeRole | null = null;- for (const node of nodes) {- const collaborators = extractNodeCollaborators(node.attributes);+): EntryRole | null => {+ const entries = Array.isArray(tree) ? tree : [tree];+ let role: EntryRole | null = null;+ for (const entry of entries) {+ const collaborators = extractEntryCollaborators(entry.attributes);const collaboratorRole = collaborators[collaboratorId];if (collaboratorRole) {role = collaboratorRole;@@ -44,19 +46,19 @@ export const extractNodeRole = (return role;};-export const hasAdminAccess = (role: NodeRole | null): boolean => {+export const hasAdminAccess = (role: EntryRole | null): boolean => {return role === 'admin';};-export const hasEditorAccess = (role: NodeRole | null): boolean => {+export const hasEditorAccess = (role: EntryRole | null): boolean => {return role === 'admin' || role === 'editor';};-export const hasCollaboratorAccess = (role: NodeRole | null): boolean => {+export const hasCollaboratorAccess = (role: EntryRole | null): boolean => {return role === 'admin' || role === 'editor' || role === 'collaborator';};-export const hasViewerAccess = (role: NodeRole | null): boolean => {+export const hasViewerAccess = (role: EntryRole | null): boolean => {return (role === 'admin' ||role === 'editor' ||diff --git a/packages/core/src/registry/channel.ts b/packages/core/src/registry/channel.tsindex 645026e8..f3daeeb1 100644--- a/packages/core/src/registry/channel.ts+++ b/packages/core/src/registry/channel.ts@@ -1,19 +1,19 @@import { isEqual } from 'lodash-es';import { z } from 'zod';-import { NodeModel, nodeRoleEnum } from './core';+import { EntryModel, entryRoleEnum } from './core';export const channelAttributesSchema = z.object({type: z.literal('channel'),name: z.string(),avatar: z.string().nullable().optional(),parentId: z.string(),- collaborators: z.record(z.string(), nodeRoleEnum).nullable().optional(),+ collaborators: z.record(z.string(), entryRoleEnum).nullable().optional(),});export type ChannelAttributes = z.infer<typeof channelAttributesSchema>;-export const channelModel: NodeModel = {+export const channelModel: EntryModel = {type: 'channel',schema: channelAttributesSchema,getName: (_, attributes) => {diff --git a/packages/core/src/registry/chat.ts b/packages/core/src/registry/chat.tsindex 1d25961a..549aad6d 100644--- a/packages/core/src/registry/chat.ts+++ b/packages/core/src/registry/chat.ts@@ -1,16 +1,16 @@import { z } from 'zod';-import { NodeModel, nodeRoleEnum } from './core';+import { EntryModel, entryRoleEnum } from './core';export const chatAttributesSchema = z.object({type: z.literal('chat'),parentId: z.string(),- collaborators: z.record(z.string(), nodeRoleEnum),+ collaborators: z.record(z.string(), entryRoleEnum),});export type ChatAttributes = z.infer<typeof chatAttributesSchema>;-export const chatModel: NodeModel = {+export const chatModel: EntryModel = {type: 'chat',schema: chatAttributesSchema,getName: () => {diff --git a/packages/core/src/registry/core.ts b/packages/core/src/registry/core.tsindex a2da3191..c0b9b022 100644--- a/packages/core/src/registry/core.ts+++ b/packages/core/src/registry/core.ts@@ -1,30 +1,30 @@import { z, ZodSchema } from 'zod';import {- extractNodeRole,+ extractEntryRole,hasAdminAccess,hasCollaboratorAccess,hasEditorAccess,hasViewerAccess,-} from '../lib/nodes';+} from '../lib/entries';import { WorkspaceRole } from '../types/workspaces';-import { Node, NodeAttributes } from './';+import { Entry, EntryAttributes } from './';-export type NodeRole = 'admin' | 'editor' | 'collaborator' | 'viewer';-export const nodeRoleEnum = z.enum([+export type EntryRole = 'admin' | 'editor' | 'collaborator' | 'viewer';+export const entryRoleEnum = z.enum(['admin','editor','collaborator','viewer',]);-export class NodeMutationContext {+export class EntryMutationContext {public accountId: string;public workspaceId: string;public userId: string;- public ancestors: Node[];- public nodeRole: NodeRole | null;+ public ancestors: Entry[];+ public entryRole: EntryRole | null;public workspaceRole: WorkspaceRole | null;constructor(@@ -32,52 +32,52 @@ export class NodeMutationContext {workspaceId: string,userId: string,workspaceRole: WorkspaceRole | null,- ancestors: Node[]+ ancestors: Entry[]) {this.accountId = accountId;this.workspaceId = workspaceId;this.userId = userId;this.workspaceRole = workspaceRole;this.ancestors = ancestors;- this.nodeRole = extractNodeRole(ancestors, userId);+ this.entryRole = extractEntryRole(ancestors, userId);}public hasAdminAccess = () => {- return hasAdminAccess(this.nodeRole);+ return hasAdminAccess(this.entryRole);};public hasEditorAccess = () => {- return hasEditorAccess(this.nodeRole);+ return hasEditorAccess(this.entryRole);};public hasCollaboratorAccess = () => {- return hasCollaboratorAccess(this.nodeRole);+ return hasCollaboratorAccess(this.entryRole);};public hasViewerAccess = () => {- return hasViewerAccess(this.nodeRole);+ return hasViewerAccess(this.entryRole);};}-export interface NodeModel {+export interface EntryModel {type: string;schema: ZodSchema;canCreate: (- context: NodeMutationContext,- attributes: NodeAttributes+ context: EntryMutationContext,+ attributes: EntryAttributes) => Promise<boolean>;canUpdate: (- context: NodeMutationContext,- node: Node,- attributes: NodeAttributes+ context: EntryMutationContext,+ entry: Entry,+ attributes: EntryAttributes) => Promise<boolean>;- canDelete: (context: NodeMutationContext, node: Node) => Promise<boolean>;+ canDelete: (context: EntryMutationContext, entry: Entry) => Promise<boolean>;getName: (id: string,- attributes: NodeAttributes+ attributes: EntryAttributes) => string | null | undefined;getText: (id: string,- attributes: NodeAttributes+ attributes: EntryAttributes) => string | null | undefined;}diff --git a/packages/core/src/registry/database.ts b/packages/core/src/registry/database.tsindex 5b6fddd6..b2d4091e 100644--- a/packages/core/src/registry/database.ts+++ b/packages/core/src/registry/database.ts@@ -1,7 +1,7 @@import { isEqual } from 'lodash-es';import { z } from 'zod';-import { NodeModel, nodeRoleEnum } from './core';+import { EntryModel, entryRoleEnum } from './core';import { fieldAttributesSchema } from './fields';export const viewFieldAttributesSchema = z.object({@@ -73,7 +73,7 @@ export const databaseAttributesSchema = z.object({name: z.string(),avatar: z.string().nullable().optional(),parentId: z.string(),- collaborators: z.record(z.string(), nodeRoleEnum).nullable().optional(),+ collaborators: z.record(z.string(), entryRoleEnum).nullable().optional(),fields: z.record(z.string(), fieldAttributesSchema),views: z.record(z.string(), viewAttributesSchema),});@@ -81,7 +81,7 @@ export const databaseAttributesSchema = z.object({export type DatabaseAttributes = z.infer<typeof databaseAttributesSchema>;export type ViewType = 'table' | 'board' | 'calendar';-export const databaseModel: NodeModel = {+export const databaseModel: EntryModel = {type: 'database',schema: databaseAttributesSchema,getName: (_, attributes) => {diff --git a/packages/core/src/registry/folder.ts b/packages/core/src/registry/folder.tsindex 90c202b0..f0ae2904 100644--- a/packages/core/src/registry/folder.ts+++ b/packages/core/src/registry/folder.ts@@ -1,19 +1,19 @@import { isEqual } from 'lodash-es';import { z } from 'zod';-import { NodeModel, nodeRoleEnum } from './core';+import { EntryModel, entryRoleEnum } from './core';export const folderAttributesSchema = z.object({type: z.literal('folder'),name: z.string(),avatar: z.string().nullable().optional(),parentId: z.string(),- collaborators: z.record(z.string(), nodeRoleEnum).nullable().optional(),+ collaborators: z.record(z.string(), entryRoleEnum).nullable().optional(),});export type FolderAttributes = z.infer<typeof folderAttributesSchema>;-export const folderModel: NodeModel = {+export const folderModel: EntryModel = {type: 'folder',schema: folderAttributesSchema,getName: (_, attributes) => {diff --git a/packages/core/src/registry/index.ts b/packages/core/src/registry/index.tsindex dba949e4..d4741c84 100644--- a/packages/core/src/registry/index.ts+++ b/packages/core/src/registry/index.ts@@ -1,13 +1,13 @@import { ChannelAttributes, channelModel } from './channel';import { ChatAttributes, chatModel } from './chat';-import { NodeModel } from './core';+import { EntryModel } from './core';import { DatabaseAttributes, databaseModel } from './database';import { FolderAttributes, folderModel } from './folder';import { PageAttributes, pageModel } from './page';import { RecordAttributes, recordModel } from './record';import { SpaceAttributes, spaceModel } from './space';-type NodeBase = {+type EntryBase = {id: string;parentId: string;rootId: string;@@ -18,60 +18,44 @@ type NodeBase = {transactionId: string;};-export type CollaborationBase = {- userId: string;- nodeId: string;- type: NodeType;- createdAt: string;- createdBy: string | null;- removedAt: string | null;-};--export type ChannelNode = NodeBase & {+export type ChannelEntry = EntryBase & {type: 'channel';attributes: ChannelAttributes;};-export type ChatNode = NodeBase & {+export type ChatEntry = EntryBase & {type: 'chat';attributes: ChatAttributes;};-export type DatabaseNode = NodeBase & {+export type DatabaseEntry = EntryBase & {type: 'database';attributes: DatabaseAttributes;};-export type FolderNode = NodeBase & {+export type FolderEntry = EntryBase & {type: 'folder';attributes: FolderAttributes;};-export type PageNode = NodeBase & {+export type PageEntry = EntryBase & {type: 'page';attributes: PageAttributes;};-export type RecordNode = NodeBase & {+export type RecordEntry = EntryBase & {type: 'record';attributes: RecordAttributes;};-export type SpaceNode = NodeBase & {+export type SpaceEntry = EntryBase & {type: 'space';attributes: SpaceAttributes;};-export type NodeType =- | 'channel'- | 'chat'- | 'database'- | 'folder'- | 'page'- | 'record'- | 'space';+export type EntryType = EntryAttributes['type'];-export type NodeAttributes =+export type EntryAttributes =| SpaceAttributes| DatabaseAttributes| ChannelAttributes@@ -80,17 +64,17 @@ export type NodeAttributes =| PageAttributes| RecordAttributes;-export type Node =- | ChannelNode- | ChatNode- | DatabaseNode- | FolderNode- | PageNode- | RecordNode- | SpaceNode;+export type Entry =+ | ChannelEntry+ | ChatEntry+ | DatabaseEntry+ | FolderEntry+ | PageEntry+ | RecordEntry+ | SpaceEntry;class Registry {- private models: Map<string, NodeModel> = new Map();+ private models: Map<string, EntryModel> = new Map();constructor() {this.models.set('channel', channelModel);@@ -102,7 +86,7 @@ class Registry {this.models.set('space', spaceModel);}- getModel(type: string): NodeModel {+ getModel(type: string): EntryModel {const model = this.models.get(type);if (!model) {throw new Error(`Model for type ${type} not found`);diff --git a/packages/core/src/registry/page.ts b/packages/core/src/registry/page.tsindex 836b5a67..343bc8a1 100644--- a/packages/core/src/registry/page.ts+++ b/packages/core/src/registry/page.ts@@ -2,7 +2,7 @@ import { isEqual } from 'lodash-es';import { z } from 'zod';import { blockSchema } from './block';-import { NodeModel, nodeRoleEnum } from './core';+import { EntryModel, entryRoleEnum } from './core';import { extractText } from '../lib/blocks';@@ -12,12 +12,12 @@ export const pageAttributesSchema = z.object({avatar: z.string().nullable().optional(),parentId: z.string(),content: z.record(blockSchema),- collaborators: z.record(z.string(), nodeRoleEnum).nullable().optional(),+ collaborators: z.record(z.string(), entryRoleEnum).nullable().optional(),});export type PageAttributes = z.infer<typeof pageAttributesSchema>;-export const pageModel: NodeModel = {+export const pageModel: EntryModel = {type: 'page',schema: pageAttributesSchema,getName: (_, attributes) => {diff --git a/packages/core/src/registry/record.ts b/packages/core/src/registry/record.tsindex 72a60541..af075489 100644--- a/packages/core/src/registry/record.ts+++ b/packages/core/src/registry/record.ts@@ -1,7 +1,7 @@import { z } from 'zod';+import { EntryModel } from './core';import { blockSchema } from './block';-import { NodeModel } from './core';import { fieldValueSchema } from './fields';import { extractText } from '../lib/blocks';@@ -18,7 +18,7 @@ export const recordAttributesSchema = z.object({export type RecordAttributes = z.infer<typeof recordAttributesSchema>;-export const recordModel: NodeModel = {+export const recordModel: EntryModel = {type: 'record',schema: recordAttributesSchema,getName: (_, attributes) => {diff --git a/packages/core/src/registry/space.ts b/packages/core/src/registry/space.tsindex f76064e1..dac8d8bb 100644--- a/packages/core/src/registry/space.ts+++ b/packages/core/src/registry/space.ts@@ -1,6 +1,6 @@import { z } from 'zod';-import { NodeModel, nodeRoleEnum } from './core';+import { EntryModel, entryRoleEnum } from './core';export const spaceAttributesSchema = z.object({type: z.literal('space'),@@ -8,12 +8,12 @@ export const spaceAttributesSchema = z.object({parentId: z.string(),description: z.string().nullable(),avatar: z.string().nullable().optional(),- collaborators: z.record(z.string(), nodeRoleEnum),+ collaborators: z.record(z.string(), entryRoleEnum),});export type SpaceAttributes = z.infer<typeof spaceAttributesSchema>;-export const spaceModel: NodeModel = {+export const spaceModel: EntryModel = {type: 'space',schema: spaceAttributesSchema,getName: (_, attributes) => {diff --git a/packages/core/src/synchronizers/collaborations.ts b/packages/core/src/synchronizers/collaborations.tsindex 3224f94d..b214d4ff 100644--- a/packages/core/src/synchronizers/collaborations.ts+++ b/packages/core/src/synchronizers/collaborations.ts@@ -1,4 +1,4 @@-import { NodeRole } from '../registry/core';+import { EntryRole } from '../registry/core';export type SyncCollaborationsInput = {type: 'collaborations';@@ -6,9 +6,9 @@ export type SyncCollaborationsInput = {export type SyncCollaborationData = {collaboratorId: string;- nodeId: string;+ entryId: string;workspaceId: string;- role: NodeRole;+ role: EntryRole;createdAt: string;createdBy: string;updatedAt: string | null;diff --git a/packages/core/src/synchronizers/files.ts b/packages/core/src/synchronizers/files.tsindex ff59220e..352cd844 100644--- a/packages/core/src/synchronizers/files.ts+++ b/packages/core/src/synchronizers/files.ts@@ -9,6 +9,7 @@ export type SyncFileData = {id: string;type: FileType;parentId: string;+ entryId: string;rootId: string;workspaceId: string;name: string;diff --git a/packages/core/src/synchronizers/messages.ts b/packages/core/src/synchronizers/messages.tsindex 85301331..4371d961 100644--- a/packages/core/src/synchronizers/messages.ts+++ b/packages/core/src/synchronizers/messages.ts@@ -9,7 +9,7 @@ export type SyncMessageData = {id: string;type: MessageType;parentId: string;- nodeId: string;+ entryId: string;rootId: string;workspaceId: string;content: MessageContent;diff --git a/packages/core/src/synchronizers/transactions.ts b/packages/core/src/synchronizers/transactions.tsindex b7305b15..28ac7c67 100644--- a/packages/core/src/synchronizers/transactions.ts+++ b/packages/core/src/synchronizers/transactions.ts@@ -6,7 +6,7 @@ export type SyncTransactionsInput = {export type SyncCreateTransactionData = {id: string;operation: 'create';- nodeId: string;+ entryId: string;rootId: string;workspaceId: string;data: string;@@ -19,7 +19,7 @@ export type SyncCreateTransactionData = {export type SyncUpdateTransactionData = {id: string;operation: 'update';- nodeId: string;+ entryId: string;rootId: string;workspaceId: string;data: string;@@ -32,7 +32,7 @@ export type SyncUpdateTransactionData = {export type SyncDeleteTransactionData = {id: string;operation: 'delete';- nodeId: string;+ entryId: string;rootId: string;workspaceId: string;createdAt: string;diff --git a/packages/core/src/types/nodes.ts b/packages/core/src/types/entries.tssimilarity index 67%rename from packages/core/src/types/nodes.tsrename to packages/core/src/types/entries.tsindex 25421fb0..6a21f82e 100644--- a/packages/core/src/types/nodes.ts+++ b/packages/core/src/types/entries.ts@@ -1,11 +1,11 @@-import { NodeAttributes } from '../registry';+import { EntryAttributes } from '../registry';-export type NodeOutput = {+export type EntryOutput = {id: string;workspaceId: string;parentId: string;type: string;- attributes: NodeAttributes;+ attributes: EntryAttributes;state: string;createdAt: string;createdBy: string;diff --git a/packages/core/src/types/mutations.ts b/packages/core/src/types/mutations.tsindex 17f23b0a..72c7bcf7 100644--- a/packages/core/src/types/mutations.ts+++ b/packages/core/src/types/mutations.ts@@ -30,6 +30,7 @@ export type CreateFileMutationData = {id: string;type: FileType;parentId: string;+ entryId: string;rootId: string;name: string;originalName: string;@@ -62,7 +63,7 @@ export type ApplyDeleteTransactionMutation = MutationBase & {export type CreateMessageMutationData = {id: string;type: MessageType;- nodeId: string;+ entryId: string;parentId: string;content: MessageContent;rootId: string;diff --git a/packages/core/src/types/sockets.ts b/packages/core/src/types/sockets.tsindex af7a4770..a018b684 100644--- a/packages/core/src/types/sockets.ts+++ b/packages/core/src/types/sockets.ts@@ -1,5 +1,3 @@-import { InteractionEvent } from './interactions';-import { SynchronizerInput, SynchronizerMap } from '../synchronizers';export type SynchronizerInputMessage = {@@ -20,14 +18,6 @@ export type SynchronizerOutputMessage<TInput extends SynchronizerInput> = {}[];};-export type SyncInteractionsMessage = {- type: 'sync_interactions';- userId: string;- nodeId: string;- rootId: string;- events: InteractionEvent[];-};-export type AccountUpdatedMessage = {type: 'account_updated';accountId: string;@@ -44,7 +34,6 @@ export type WorkspaceDeletedMessage = {};export type Message =- | SyncInteractionsMessage| AccountUpdatedMessage| WorkspaceUpdatedMessage| WorkspaceDeletedMessagediff --git a/packages/core/src/types/sync.ts b/packages/core/src/types/sync.tsindex 1adfc7d2..de5efd3e 100644--- a/packages/core/src/types/sync.ts+++ b/packages/core/src/types/sync.ts@@ -1,5 +1,3 @@-import { InteractionAttributes } from './interactions';-export type LocalTransaction =| LocalCreateTransaction| LocalUpdateTransaction@@ -7,7 +5,7 @@ export type LocalTransaction =export type LocalCreateTransaction = {id: string;- nodeId: string;+ entryId: string;rootId: string;operation: 'create';data: string;@@ -17,7 +15,7 @@ export type LocalCreateTransaction = {export type LocalUpdateTransaction = {id: string;- nodeId: string;+ entryId: string;rootId: string;operation: 'update';data: string;@@ -27,21 +25,9 @@ export type LocalUpdateTransaction = {export type LocalDeleteTransaction = {id: string;- nodeId: string;+ entryId: string;rootId: string;operation: 'delete';createdAt: string;createdBy: string;};--export type ServerInteraction = {- userId: string;- nodeId: string;- workspaceId: string;- attributes: InteractionAttributes;- createdAt: string;- updatedAt: string | null;- serverCreatedAt: string;- serverUpdatedAt: string | null;- version: string;-};diff --git a/packages/core/src/types/workspaces.ts b/packages/core/src/types/workspaces.tsindex 5d8e5267..c5c01101 100644--- a/packages/core/src/types/workspaces.ts+++ b/packages/core/src/types/workspaces.ts@@ -1,4 +1,4 @@-import { NodeOutput } from './nodes';+import { EntryOutput } from './entries.js';export type WorkspaceRole =| 'owner'@@ -63,5 +63,5 @@ export type UserRoleUpdateInput = {};export type UserRoleUpdateOutput = {- user: NodeOutput;+ user: EntryOutput;};diff --git a/scripts/src/seed/node-generator.ts b/scripts/src/seed/node-generator.tsindex 3bca5713..dcc3486c 100644--- a/scripts/src/seed/node-generator.ts+++ b/scripts/src/seed/node-generator.ts@@ -2,8 +2,8 @@ import {Block,generateId,IdType,- NodeAttributes,- NodeRole,+ EntryAttributes,+ EntryRole,registry,generateNodeIndex,ViewAttributes,@@ -101,12 +101,12 @@ export class NodeGenerator {private buildSpace(name: string, description: string, avatar: string) {const spaceId = generateId(IdType.Space);- const collaborators: Record<string, NodeRole> = {};+ const collaborators: Record<string, EntryRole> = {};for (const user of this.users) {collaborators[user.userId] = 'admin';}- const spaceAttributes: NodeAttributes = {+ const spaceAttributes: EntryAttributes = {type: 'space',name,description,@@ -141,7 +141,7 @@ export class NodeGenerator {avatar: string) {const channelId = generateId(IdType.Channel);- const channelAttributes: NodeAttributes = {+ const channelAttributes: EntryAttributes = {type: 'channel',name,parentId,@@ -171,7 +171,7 @@ export class NodeGenerator {private buildChat(user: User) {const mainUser = this.getMainUser();const chatId = generateId(IdType.Chat);- const chatAttributes: NodeAttributes = {+ const chatAttributes: EntryAttributes = {type: 'chat',parentId: this.workspaceId,collaborators: {@@ -209,7 +209,7 @@ export class NodeGenerator {avatar: string) {const pageId = generateId(IdType.Page);- const pageAttributes: NodeAttributes = {+ const pageAttributes: EntryAttributes = {type: 'page',name,parentId,@@ -256,7 +256,7 @@ export class NodeGenerator {data: {id: messageId,type: 'standard',- nodeId: conversationId,+ entryId: conversationId,parentId: conversationId,rootId,content: {@@ -447,7 +447,7 @@ export class NodeGenerator {sorts: {},};- const databaseAttributes: NodeAttributes = {+ const databaseAttributes: EntryAttributes = {type: 'database',parentId,name: 'Tasks',@@ -702,7 +702,7 @@ export class NodeGenerator {sorts: {},};- const databaseAttributes: NodeAttributes = {+ const databaseAttributes: EntryAttributes = {type: 'database',parentId,name: 'Clients',@@ -848,7 +848,7 @@ export class NodeGenerator {sorts: {},};- const databaseAttributes: NodeAttributes = {+ const databaseAttributes: EntryAttributes = {type: 'database',parentId,name: 'Meetings',@@ -906,7 +906,7 @@ export class NodeGenerator {databaseAttributes: DatabaseAttributes) {const recordId = generateId(IdType.Record);- const recordAttributes: NodeAttributes = {+ const recordAttributes: EntryAttributes = {type: 'record',parentId: databaseId,databaseId,@@ -956,9 +956,9 @@ export class NodeGenerator {private buildCreateTransaction(rootId: string,- nodeId: string,+ entryId: string,userId: string,- attributes: NodeAttributes+ attributes: EntryAttributes): LocalCreateTransaction {const ydoc = new YDoc();const model = registry.getModel(attributes.type);@@ -969,7 +969,7 @@ export class NodeGenerator {id: generateId(IdType.Transaction),operation: 'create',data: encodeState(update),- nodeId,+ entryId,rootId,createdAt: new Date().toISOString(),createdBy: userId,