Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Fix imports order
Hakan Shehu3df94f7c4042
diff --git a/.eslintrc.json b/.eslintrc.jsonindex 81f45d80..4c7ebd4c 100644--- a/.eslintrc.json+++ b/.eslintrc.json@@ -5,8 +5,10 @@"plugin:@typescript-eslint/eslint-recommended","plugin:@typescript-eslint/recommended","plugin:import/recommended",- "plugin:import/typescript"+ "plugin:import/typescript",+ "prettier"],+ "plugins": ["import"],"parser": "@typescript-eslint/parser","parserOptions": {"ecmaVersion": 2020@@ -22,7 +24,20 @@"error",{ "vars": "all", "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }],- "no-console": "off"+ "no-console": "off",+ "import/order": [+ "error",+ {+ "groups": [+ "external",+ "builtin",+ "internal",+ "sibling",+ "parent",+ "index"+ ]+ }+ ]},"ignorePatterns": ["dist", "node_modules"]}diff --git a/apps/desktop/forge.config.ts b/apps/desktop/forge.config.tsindex bebef8e1..fc4c4929 100644--- a/apps/desktop/forge.config.ts+++ b/apps/desktop/forge.config.ts@@ -1,11 +1,11 @@-import type { ForgeConfig } from '@electron-forge/shared-types';-import { MakerSquirrel } from '@electron-forge/maker-squirrel';-import { MakerZIP } from '@electron-forge/maker-zip';+import { FuseV1Options, FuseVersion } from '@electron/fuses';import { MakerDeb } from '@electron-forge/maker-deb';import { MakerRpm } from '@electron-forge/maker-rpm';-import { VitePlugin } from '@electron-forge/plugin-vite';+import { MakerSquirrel } from '@electron-forge/maker-squirrel';+import { MakerZIP } from '@electron-forge/maker-zip';import { FusesPlugin } from '@electron-forge/plugin-fuses';-import { FuseV1Options, FuseVersion } from '@electron/fuses';+import { VitePlugin } from '@electron-forge/plugin-vite';+import type { ForgeConfig } from '@electron-forge/shared-types';import fs from 'fs/promises';const config: ForgeConfig = {diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.tsindex e8098290..d3ecb0ef 100644--- a/apps/desktop/src/main.ts+++ b/apps/desktop/src/main.ts@@ -1,19 +1,20 @@+import started from 'electron-squirrel-startup';import { app, BrowserWindow, ipcMain, protocol } from 'electron';import path from 'path';-import { eventBus } from '@/shared/lib/event-bus';++import { bootstrapper } from '@/main/bootstrapper';+import { closeLoggers, createLogger } from '@/main/logger';+import { assetService } from '@/main/services/asset-service';import { avatarService } from '@/main/services/avatar-service';+import { commandService } from '@/main/services/command-service';import { fileService } from '@/main/services/file-service';-import { assetService } from '@/main/services/asset-service';-import { MutationMap, MutationInput } from '@/shared/mutations';-import { QueryMap, QueryInput } from '@/shared/queries';import { mutationService } from '@/main/services/mutation-service';import { queryService } from '@/main/services/query-service';-import { CommandMap, CommandInput } from '@/shared/commands';-import { commandService } from '@/main/services/command-service';-import { bootstrapper } from '@/main/bootstrapper';-import started from 'electron-squirrel-startup';-import { closeLoggers, createLogger } from '@/main/logger';import { getAppIconPath } from '@/main/utils';+import { CommandInput,CommandMap } from '@/shared/commands';+import { eventBus } from '@/shared/lib/event-bus';+import { MutationInput,MutationMap } from '@/shared/mutations';+import { QueryInput,QueryMap } from '@/shared/queries';const logger = createLogger('main');diff --git a/apps/desktop/src/main/bootstrapper.ts b/apps/desktop/src/main/bootstrapper.tsindex d2ab49c5..d5464ff7 100644--- a/apps/desktop/src/main/bootstrapper.ts+++ b/apps/desktop/src/main/bootstrapper.ts@@ -1,13 +1,13 @@import { databaseService } from '@/main/data/database-service';+import { createLogger } from '@/main/logger';+import { accountService } from '@/main/services/account-service';import { assetService } from '@/main/services/asset-service';+import { fileService } from '@/main/services/file-service';+import { notificationService } from '@/main/services/notification-service';import { radarService } from '@/main/services/radar-service';-import { socketService } from '@/main/services/socket-service';import { serverService } from '@/main/services/server-service';-import { accountService } from '@/main/services/account-service';+import { socketService } from '@/main/services/socket-service';import { syncService } from '@/main/services/sync-service';-import { notificationService } from '@/main/services/notification-service';-import { fileService } from '@/main/services/file-service';-import { createLogger } from '@/main/logger';// one minuteconst EVENT_LOOP_INTERVAL = 1000 * 60;diff --git a/apps/desktop/src/main/commands/file-dialog-open.ts b/apps/desktop/src/main/commands/file-dialog-open.tsindex e6561244..efb18b6f 100644--- a/apps/desktop/src/main/commands/file-dialog-open.ts+++ b/apps/desktop/src/main/commands/file-dialog-open.ts@@ -1,6 +1,7 @@+import { BrowserWindow, dialog } from 'electron';+import { CommandHandler } from '@/main/types';import { FileDialogOpenCommandInput } from '@/shared/commands/file-dialog-open';-import { BrowserWindow, dialog } from 'electron';export class FileDialogOpenCommandHandlerimplements CommandHandler<FileDialogOpenCommandInput>diff --git a/apps/desktop/src/main/commands/file-open.ts b/apps/desktop/src/main/commands/file-open.tsindex e7f1de5f..abf07772 100644--- a/apps/desktop/src/main/commands/file-open.ts+++ b/apps/desktop/src/main/commands/file-open.ts@@ -1,6 +1,6 @@+import { fileService } from '@/main/services/file-service';import { CommandHandler } from '@/main/types';import { FileOpenCommandInput } from '@/shared/commands/file-open';-import { fileService } from '@/main/services/file-service';export class FileOpenCommandHandlerimplements CommandHandler<FileOpenCommandInput>diff --git a/apps/desktop/src/main/commands/index.ts b/apps/desktop/src/main/commands/index.tsindex e5250e82..77ee61a1 100644--- a/apps/desktop/src/main/commands/index.ts+++ b/apps/desktop/src/main/commands/index.ts@@ -1,8 +1,8 @@-import { CommandMap } from '@/shared/commands';-import { CommandHandler } from '@/main/types';import { FileDialogOpenCommandHandler } from '@/main/commands/file-dialog-open';import { FileOpenCommandHandler } from '@/main/commands/file-open';import { UrlOpenCommandHandler } from '@/main/commands/url-open';+import { CommandHandler } from '@/main/types';+import { CommandMap } from '@/shared/commands';type CommandHandlerMap = {[K in keyof CommandMap]: CommandHandler<CommandMap[K]['input']>;diff --git a/apps/desktop/src/main/commands/url-open.ts b/apps/desktop/src/main/commands/url-open.tsindex 9882b189..37e14dcf 100644--- a/apps/desktop/src/main/commands/url-open.ts+++ b/apps/desktop/src/main/commands/url-open.ts@@ -1,6 +1,7 @@+import { shell } from 'electron';+import { CommandHandler } from '@/main/types';import { UrlOpenCommandInput } from '@/shared/commands/url-open';-import { shell } from 'electron';export class UrlOpenCommandHandlerimplements CommandHandler<UrlOpenCommandInput>diff --git a/apps/desktop/src/main/data/database-service.ts b/apps/desktop/src/main/data/database-service.tsindex a52de363..692b7992 100644--- a/apps/desktop/src/main/data/database-service.ts+++ b/apps/desktop/src/main/data/database-service.ts@@ -1,13 +1,14 @@-import fs from 'fs';import SQLite from 'better-sqlite3';import { Kysely, Migration, Migrator, SqliteDialect } from 'kysely';-import { AppDatabaseSchema } from '@/main/data/app/schema';-import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';+import fs from 'fs';+import { appDatabaseMigrations } from '@/main/data/app/migrations';+import { AppDatabaseSchema } from '@/main/data/app/schema';import { workspaceDatabaseMigrations } from '@/main/data/workspace/migrations';+import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';+import { createLogger } from '@/main/logger';import { appDatabasePath, getWorkspaceDirectoryPath } from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';-import { createLogger } from '@/main/logger';class DatabaseService {private initPromise: Promise<void> | null = null;diff --git a/apps/desktop/src/main/logger.ts b/apps/desktop/src/main/logger.tsindex 44bbeab6..2b891190 100644--- a/apps/desktop/src/main/logger.ts+++ b/apps/desktop/src/main/logger.ts@@ -1,5 +1,5 @@-import { app } from 'electron';import pino, { Level, Logger } from 'pino';+import { app } from 'electron';import path from 'path';const logConfig: Record<string, Level> = {diff --git a/apps/desktop/src/main/mutations/account-logout.ts b/apps/desktop/src/main/mutations/account-logout.tsindex dd22f9ce..b4bff472 100644--- a/apps/desktop/src/main/mutations/account-logout.ts+++ b/apps/desktop/src/main/mutations/account-logout.ts@@ -1,10 +1,10 @@import { databaseService } from '@/main/data/database-service';+import { accountService } from '@/main/services/account-service';+import { MutationHandler } from '@/main/types';import {AccountLogoutMutationInput,AccountLogoutMutationOutput,} from '@/shared/mutations/account-logout';-import { MutationHandler } from '@/main/types';-import { accountService } from '@/main/services/account-service';export class AccountLogoutMutationHandlerimplements MutationHandler<AccountLogoutMutationInput>diff --git a/apps/desktop/src/main/mutations/account-update.ts b/apps/desktop/src/main/mutations/account-update.tsindex 12e99003..3ee1c1a5 100644--- a/apps/desktop/src/main/mutations/account-update.ts+++ b/apps/desktop/src/main/mutations/account-update.ts@@ -1,12 +1,13 @@+import { AccountUpdateOutput } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { httpClient } from '@/shared/lib/http-client';import { MutationHandler } from '@/main/types';-import { AccountUpdateOutput } from '@colanode/core';+import { eventBus } from '@/shared/lib/event-bus';+import { httpClient } from '@/shared/lib/http-client';import {AccountUpdateMutationInput,AccountUpdateMutationOutput,} from '@/shared/mutations/account-update';-import { eventBus } from '@/shared/lib/event-bus';export class AccountUpdateMutationHandlerimplements MutationHandler<AccountUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/avatar-upload.ts b/apps/desktop/src/main/mutations/avatar-upload.tsindex 821ab7ae..95942446 100644--- a/apps/desktop/src/main/mutations/avatar-upload.ts+++ b/apps/desktop/src/main/mutations/avatar-upload.ts@@ -1,12 +1,13 @@-import fs from 'fs';import FormData from 'form-data';+import fs from 'fs';+import { databaseService } from '@/main/data/database-service';import { MutationHandler } from '@/main/types';+import { httpClient } from '@/shared/lib/http-client';import {AvatarUploadMutationInput,AvatarUploadMutationOutput,} from '@/shared/mutations/avatar-upload';-import { httpClient } from '@/shared/lib/http-client';interface AvatarUploadResponse {id: string;diff --git a/apps/desktop/src/main/mutations/channel-create.ts b/apps/desktop/src/main/mutations/channel-create.tsindex d0791a8c..30cec7a3 100644--- a/apps/desktop/src/main/mutations/channel-create.ts+++ b/apps/desktop/src/main/mutations/channel-create.ts@@ -1,11 +1,12 @@+import { ChannelAttributes,generateId, IdType } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { generateId, IdType, ChannelAttributes } from '@colanode/core';+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {ChannelCreateMutationInput,ChannelCreateMutationOutput,} from '@/shared/mutations/channel-create';-import { nodeService } from '@/main/services/node-service';export class ChannelCreateMutationHandlerimplements MutationHandler<ChannelCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/channel-update.ts b/apps/desktop/src/main/mutations/channel-update.tsindex df5865be..4805c72c 100644--- a/apps/desktop/src/main/mutations/channel-update.ts+++ b/apps/desktop/src/main/mutations/channel-update.ts@@ -1,9 +1,9 @@+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {ChannelUpdateMutationInput,ChannelUpdateMutationOutput,} from '@/shared/mutations/channel-update';-import { nodeService } from '@/main/services/node-service';export class ChannelUpdateMutationHandlerimplements MutationHandler<ChannelUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/chat-create.ts b/apps/desktop/src/main/mutations/chat-create.tsindex 255aba6b..9dc26353 100644--- a/apps/desktop/src/main/mutations/chat-create.ts+++ b/apps/desktop/src/main/mutations/chat-create.ts@@ -1,12 +1,13 @@+import { ChatAttributes,generateId, IdType, NodeTypes } from '@colanode/core';+import { sql } from 'kysely';+import { databaseService } from '@/main/data/database-service';-import { generateId, IdType, NodeTypes, ChatAttributes } from '@colanode/core';+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {ChatCreateMutationInput,ChatCreateMutationOutput,} from '@/shared/mutations/chat-create';-import { sql } from 'kysely';-import { nodeService } from '@/main/services/node-service';interface ChatRow {id: string;diff --git a/apps/desktop/src/main/mutations/database-create.ts b/apps/desktop/src/main/mutations/database-create.tsindex 320d7b13..3860d169 100644--- a/apps/desktop/src/main/mutations/database-create.ts+++ b/apps/desktop/src/main/mutations/database-create.ts@@ -1,15 +1,16 @@import {- generateId,- IdType,DatabaseAttributes,+ generateId,generateNodeIndex,+ IdType,} from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {DatabaseCreateMutationInput,DatabaseCreateMutationOutput,} from '@/shared/mutations/database-create';-import { nodeService } from '@/main/services/node-service';export class DatabaseCreateMutationHandlerimplements MutationHandler<DatabaseCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/database-update.ts b/apps/desktop/src/main/mutations/database-update.tsindex 1b5b4f03..9a0228ba 100644--- a/apps/desktop/src/main/mutations/database-update.ts+++ b/apps/desktop/src/main/mutations/database-update.ts@@ -1,9 +1,9 @@+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {DatabaseUpdateMutationInput,DatabaseUpdateMutationOutput,} from '@/shared/mutations/database-update';-import { nodeService } from '@/main/services/node-service';export class DatabaseUpdateMutationHandlerimplements MutationHandler<DatabaseUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/document-save.ts b/apps/desktop/src/main/mutations/document-save.tsindex 0d395c84..15c3d82c 100644--- a/apps/desktop/src/main/mutations/document-save.ts+++ b/apps/desktop/src/main/mutations/document-save.ts@@ -1,11 +1,12 @@+import { Block } from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';+import { mapContentsToBlocks } from '@/shared/lib/editor';import {DocumentSaveMutationInput,DocumentSaveMutationOutput,} from '@/shared/mutations/document-save';-import { mapContentsToBlocks } from '@/shared/lib/editor';-import { Block } from '@colanode/core';-import { nodeService } from '@/main/services/node-service';export class DocumentSaveMutationHandlerimplements MutationHandler<DocumentSaveMutationInput>diff --git a/apps/desktop/src/main/mutations/email-login.ts b/apps/desktop/src/main/mutations/email-login.tsindex 57cdcf2b..5eee0de3 100644--- a/apps/desktop/src/main/mutations/email-login.ts+++ b/apps/desktop/src/main/mutations/email-login.ts@@ -1,12 +1,13 @@import { LoginOutput } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';+import { MutationHandler } from '@/main/types';+import { eventBus } from '@/shared/lib/event-bus';+import { httpClient } from '@/shared/lib/http-client';import {EmailLoginMutationInput,EmailLoginMutationOutput,} from '@/shared/mutations/email-login';-import { MutationHandler } from '@/main/types';-import { httpClient } from '@/shared/lib/http-client';-import { eventBus } from '@/shared/lib/event-bus';import { Account } from '@/shared/types/accounts';export class EmailLoginMutationHandlerdiff --git a/apps/desktop/src/main/mutations/email-register.ts b/apps/desktop/src/main/mutations/email-register.tsindex a7096672..0f77258c 100644--- a/apps/desktop/src/main/mutations/email-register.ts+++ b/apps/desktop/src/main/mutations/email-register.ts@@ -1,12 +1,13 @@import { LoginOutput } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';+import { MutationHandler } from '@/main/types';+import { eventBus } from '@/shared/lib/event-bus';import { httpClient } from '@/shared/lib/http-client';import {EmailRegisterMutationInput,EmailRegisterMutationOutput,} from '@/shared/mutations/email-register';-import { MutationHandler } from '@/main/types';-import { eventBus } from '@/shared/lib/event-bus';import { Account } from '@/shared/types/accounts';export class EmailRegisterMutationHandlerdiff --git a/apps/desktop/src/main/mutations/field-create.ts b/apps/desktop/src/main/mutations/field-create.tsindex ba02526c..715e781b 100644--- a/apps/desktop/src/main/mutations/field-create.ts+++ b/apps/desktop/src/main/mutations/field-create.ts@@ -1,15 +1,16 @@import {+ compareString,generateId,- IdType,generateNodeIndex,- compareString,+ IdType,} from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {FieldCreateMutationInput,FieldCreateMutationOutput,} from '@/shared/mutations/field-create';-import { nodeService } from '@/main/services/node-service';export class FieldCreateMutationHandlerimplements MutationHandler<FieldCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/file-create.ts b/apps/desktop/src/main/mutations/file-create.tsindex 17f55632..57c3c047 100644--- a/apps/desktop/src/main/mutations/file-create.ts+++ b/apps/desktop/src/main/mutations/file-create.ts@@ -1,16 +1,17 @@-import { MutationHandler } from '@/main/types';import {extractFileType,+ FileAttributes,generateId,IdType,- FileAttributes,} from '@colanode/core';++import { fileService } from '@/main/services/file-service';+import { nodeService } from '@/main/services/node-service';+import { MutationHandler } from '@/main/types';import {FileCreateMutationInput,FileCreateMutationOutput,} from '@/shared/mutations/file-create';-import { fileService } from '@/main/services/file-service';-import { nodeService } from '@/main/services/node-service';export class FileCreateMutationHandlerimplements MutationHandler<FileCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/file-download.ts b/apps/desktop/src/main/mutations/file-download.tsindex bbe25f1e..7dc99db2 100644--- a/apps/desktop/src/main/mutations/file-download.ts+++ b/apps/desktop/src/main/mutations/file-download.ts@@ -1,11 +1,11 @@-import { eventBus } from '@/shared/lib/event-bus';import { databaseService } from '@/main/data/database-service';import { MutationHandler } from '@/main/types';+import { mapNode } from '@/main/utils';+import { eventBus } from '@/shared/lib/event-bus';import {FileDownloadMutationInput,FileDownloadMutationOutput,} from '@/shared/mutations/file-download';-import { mapNode } from '@/main/utils';export class FileDownloadMutationHandlerimplements MutationHandler<FileDownloadMutationInput>diff --git a/apps/desktop/src/main/mutations/folder-create.ts b/apps/desktop/src/main/mutations/folder-create.tsindex 673c33c4..06742074 100644--- a/apps/desktop/src/main/mutations/folder-create.ts+++ b/apps/desktop/src/main/mutations/folder-create.ts@@ -1,10 +1,11 @@-import { generateId, IdType, FolderAttributes } from '@colanode/core';+import { FolderAttributes,generateId, IdType } from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {FolderCreateMutationInput,FolderCreateMutationOutput,} from '@/shared/mutations/folder-create';-import { nodeService } from '@/main/services/node-service';export class FolderCreateMutationHandlerimplements MutationHandler<FolderCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/folder-update.ts b/apps/desktop/src/main/mutations/folder-update.tsindex c4adb100..cad72397 100644--- a/apps/desktop/src/main/mutations/folder-update.ts+++ b/apps/desktop/src/main/mutations/folder-update.ts@@ -1,9 +1,9 @@+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {FolderUpdateMutationInput,FolderUpdateMutationOutput,} from '@/shared/mutations/folder-update';-import { nodeService } from '@/main/services/node-service';export class FolderUpdateMutationHandlerimplements MutationHandler<FolderUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/index.ts b/apps/desktop/src/main/mutations/index.tsindex 09c49a3b..800cef54 100644--- a/apps/desktop/src/main/mutations/index.ts+++ b/apps/desktop/src/main/mutations/index.ts@@ -1,12 +1,20 @@-import { MutationMap } from '@/shared/mutations';-import { MutationHandler } from '@/main/types';-import { EmailLoginMutationHandler } from '@/main/mutations/email-login';-import { EmailRegisterMutationHandler } from '@/main/mutations/email-register';-import { ViewCreateMutationHandler } from '@/main/mutations/view-create';+import { AccountLogoutMutationHandler } from '@/main/mutations/account-logout';+import { AccountUpdateMutationHandler } from '@/main/mutations/account-update';+import { AvatarUploadMutationHandler } from '@/main/mutations/avatar-upload';import { ChannelCreateMutationHandler } from '@/main/mutations/channel-create';+import { ChannelUpdateMutationHandler } from '@/main/mutations/channel-update';import { ChatCreateMutationHandler } from '@/main/mutations/chat-create';import { DatabaseCreateMutationHandler } from '@/main/mutations/database-create';+import { DatabaseUpdateMutationHandler } from '@/main/mutations/database-update';+import { DocumentSaveMutationHandler } from '@/main/mutations/document-save';+import { EmailLoginMutationHandler } from '@/main/mutations/email-login';+import { EmailRegisterMutationHandler } from '@/main/mutations/email-register';import { FieldCreateMutationHandler } from '@/main/mutations/field-create';+import { FileCreateMutationHandler } from '@/main/mutations/file-create';+import { FileDownloadMutationHandler } from '@/main/mutations/file-download';+import { FolderCreateMutationHandler } from '@/main/mutations/folder-create';+import { FolderUpdateMutationHandler } from '@/main/mutations/folder-update';+import { MarkNodeAsSeenMutationHandler } from '@/main/mutations/mark-node-as-seen';import { MessageCreateMutationHandler } from '@/main/mutations/message-create';import { NodeAttributeDeleteMutationHandler } from '@/main/mutations/node-attribute-delete';import { NodeAttributeSetMutationHandler } from '@/main/mutations/node-attribute-set';@@ -14,32 +22,24 @@ import { NodeCollaboratorCreateMutationHandler } from '@/main/mutations/node-colimport { NodeCollaboratorDeleteMutationHandler } from '@/main/mutations/node-collaborator-delete';import { NodeCollaboratorUpdateMutationHandler } from '@/main/mutations/node-collaborator-update';import { NodeDeleteMutationHandler } from '@/main/mutations/node-delete';-import { PageCreateMutationHandler } from '@/main/mutations/page-create';import { NodeReactionCreateMutationHandler } from '@/main/mutations/node-reaction-create';import { NodeReactionDeleteMutationHandler } from '@/main/mutations/node-reaction-delete';+import { PageCreateMutationHandler } from '@/main/mutations/page-create';+import { PageUpdateMutationHandler } from '@/main/mutations/page-update';import { RecordCreateMutationHandler } from '@/main/mutations/record-create';import { SelectOptionCreateMutationHandler } from '@/main/mutations/select-option-create';import { ServerCreateMutationHandler } from '@/main/mutations/server-create';import { SpaceCreateMutationHandler } from '@/main/mutations/space-create';-import { WorkspaceUserRoleUpdateMutationHandler } from '@/main/mutations/workspace-user-role-update';-import { WorkspaceUsersInviteMutationHandler } from '@/main/mutations/workspace-users-invite';-import { WorkspaceCreateMutationHandler } from '@/main/mutations/workspace-create';-import { WorkspaceUpdateMutationHandler } from '@/main/mutations/workspace-update';-import { DocumentSaveMutationHandler } from '@/main/mutations/document-save';-import { AvatarUploadMutationHandler } from '@/main/mutations/avatar-upload';-import { AccountLogoutMutationHandler } from '@/main/mutations/account-logout';-import { FolderCreateMutationHandler } from '@/main/mutations/folder-create';-import { FileCreateMutationHandler } from '@/main/mutations/file-create';-import { FileDownloadMutationHandler } from '@/main/mutations/file-download';import { SpaceUpdateMutationHandler } from '@/main/mutations/space-update';-import { AccountUpdateMutationHandler } from '@/main/mutations/account-update';-import { MarkNodeAsSeenMutationHandler } from '@/main/mutations/mark-node-as-seen';-import { ViewUpdateMutationHandler } from '@/main/mutations/view-update';+import { ViewCreateMutationHandler } from '@/main/mutations/view-create';import { ViewDeleteMutationHandler } from '@/main/mutations/view-delete';-import { ChannelUpdateMutationHandler } from '@/main/mutations/channel-update';-import { PageUpdateMutationHandler } from '@/main/mutations/page-update';-import { FolderUpdateMutationHandler } from '@/main/mutations/folder-update';-import { DatabaseUpdateMutationHandler } from '@/main/mutations/database-update';+import { ViewUpdateMutationHandler } from '@/main/mutations/view-update';+import { WorkspaceCreateMutationHandler } from '@/main/mutations/workspace-create';+import { WorkspaceUpdateMutationHandler } from '@/main/mutations/workspace-update';+import { WorkspaceUserRoleUpdateMutationHandler } from '@/main/mutations/workspace-user-role-update';+import { WorkspaceUsersInviteMutationHandler } from '@/main/mutations/workspace-users-invite';+import { MutationHandler } from '@/main/types';+import { MutationMap } from '@/shared/mutations';type MutationHandlerMap = {[K in keyof MutationMap]: MutationHandler<MutationMap[K]['input']>;diff --git a/apps/desktop/src/main/mutations/mark-node-as-seen.ts b/apps/desktop/src/main/mutations/mark-node-as-seen.tsindex 9b2096ae..deb72c60 100644--- a/apps/desktop/src/main/mutations/mark-node-as-seen.ts+++ b/apps/desktop/src/main/mutations/mark-node-as-seen.ts@@ -1,9 +1,9 @@+import { interactionService } from '@/main/services/interaction-service';import { MutationHandler } from '@/main/types';import {MarkNodeAsSeenMutationInput,MarkNodeAsSeenMutationOutput,} from '@/shared/mutations/mark-node-as-seen';-import { interactionService } from '@/main/services/interaction-service';export class MarkNodeAsSeenMutationHandlerimplements MutationHandler<MarkNodeAsSeenMutationInput>diff --git a/apps/desktop/src/main/mutations/message-create.ts b/apps/desktop/src/main/mutations/message-create.tsindex c3b80ca8..01957121 100644--- a/apps/desktop/src/main/mutations/message-create.ts+++ b/apps/desktop/src/main/mutations/message-create.ts@@ -1,21 +1,22 @@import {- generateId,- IdType,+ Block,EditorNodeTypes,- NodeTypes,extractFileType,- Block,FileAttributes,+ generateId,+ IdType,MessageAttributes,+ NodeTypes,} from '@colanode/core';++import { fileService } from '@/main/services/file-service';+import { CreateNodeInput, nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';+import { mapContentsToBlocks } from '@/shared/lib/editor';import {MessageCreateMutationInput,MessageCreateMutationOutput,} from '@/shared/mutations/message-create';-import { mapContentsToBlocks } from '@/shared/lib/editor';-import { fileService } from '@/main/services/file-service';-import { CreateNodeInput, nodeService } from '@/main/services/node-service';export class MessageCreateMutationHandlerimplements MutationHandler<MessageCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/node-attribute-delete.ts b/apps/desktop/src/main/mutations/node-attribute-delete.tsindex 48ef7026..c8d101aa 100644--- a/apps/desktop/src/main/mutations/node-attribute-delete.ts+++ b/apps/desktop/src/main/mutations/node-attribute-delete.ts@@ -1,10 +1,11 @@+import { unset } from 'lodash-es';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {NodeAttributeDeleteMutationInput,NodeAttributeDeleteMutationOutput,} from '@/shared/mutations/node-attribute-delete';-import { nodeService } from '@/main/services/node-service';-import { unset } from 'lodash-es';export class NodeAttributeDeleteMutationHandlerimplements MutationHandler<NodeAttributeDeleteMutationInput>diff --git a/apps/desktop/src/main/mutations/node-attribute-set.ts b/apps/desktop/src/main/mutations/node-attribute-set.tsindex 6afa6f6b..36ee6501 100644--- a/apps/desktop/src/main/mutations/node-attribute-set.ts+++ b/apps/desktop/src/main/mutations/node-attribute-set.ts@@ -1,10 +1,11 @@+import { set } from 'lodash-es';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {NodeAttributeSetMutationInput,NodeAttributeSetMutationOutput,} from '@/shared/mutations/node-attribute-set';-import { nodeService } from '@/main/services/node-service';-import { set } from 'lodash-es';export class NodeAttributeSetMutationHandlerimplements MutationHandler<NodeAttributeSetMutationInput>diff --git a/apps/desktop/src/main/mutations/node-collaborator-create.ts b/apps/desktop/src/main/mutations/node-collaborator-create.tsindex 6bda0225..6177beb9 100644--- a/apps/desktop/src/main/mutations/node-collaborator-create.ts+++ b/apps/desktop/src/main/mutations/node-collaborator-create.ts@@ -1,10 +1,11 @@+import { set } from 'lodash-es';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {NodeCollaboratorCreateMutationInput,NodeCollaboratorCreateMutationOutput,} from '@/shared/mutations/node-collaborator-create';-import { nodeService } from '@/main/services/node-service';-import { set } from 'lodash-es';export class NodeCollaboratorCreateMutationHandlerimplements MutationHandler<NodeCollaboratorCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/node-collaborator-delete.ts b/apps/desktop/src/main/mutations/node-collaborator-delete.tsindex 0542e681..7676543b 100644--- a/apps/desktop/src/main/mutations/node-collaborator-delete.ts+++ b/apps/desktop/src/main/mutations/node-collaborator-delete.ts@@ -1,10 +1,11 @@+import { unset } from 'lodash-es';+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {NodeCollaboratorDeleteMutationInput,NodeCollaboratorDeleteMutationOutput,} from '@/shared/mutations/node-collaborator-delete';-import { unset } from 'lodash-es';export class NodeCollaboratorDeleteMutationHandlerimplements MutationHandler<NodeCollaboratorDeleteMutationInput>diff --git a/apps/desktop/src/main/mutations/node-collaborator-update.ts b/apps/desktop/src/main/mutations/node-collaborator-update.tsindex 822734a1..9e5d0ddd 100644--- a/apps/desktop/src/main/mutations/node-collaborator-update.ts+++ b/apps/desktop/src/main/mutations/node-collaborator-update.ts@@ -1,10 +1,11 @@+import { set } from 'lodash-es';+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {NodeCollaboratorUpdateMutationInput,NodeCollaboratorUpdateMutationOutput,} from '@/shared/mutations/node-collaborator-update';-import { set } from 'lodash-es';export class NodeCollaboratorUpdateMutationHandlerimplements MutationHandler<NodeCollaboratorUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/node-delete.ts b/apps/desktop/src/main/mutations/node-delete.tsindex d65fc097..68e84b24 100644--- a/apps/desktop/src/main/mutations/node-delete.ts+++ b/apps/desktop/src/main/mutations/node-delete.ts@@ -1,9 +1,9 @@+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {NodeDeleteMutationInput,NodeDeleteMutationOutput,} from '@/shared/mutations/node-delete';-import { nodeService } from '@/main/services/node-service';export class NodeDeleteMutationHandlerimplements MutationHandler<NodeDeleteMutationInput>diff --git a/apps/desktop/src/main/mutations/page-create.ts b/apps/desktop/src/main/mutations/page-create.tsindex d79d2436..ae812364 100644--- a/apps/desktop/src/main/mutations/page-create.ts+++ b/apps/desktop/src/main/mutations/page-create.ts@@ -1,10 +1,11 @@import { generateId, IdType, PageAttributes } from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {PageCreateMutationInput,PageCreateMutationOutput,} from '@/shared/mutations/page-create';-import { nodeService } from '@/main/services/node-service';export class PageCreateMutationHandlerimplements MutationHandler<PageCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/page-update.ts b/apps/desktop/src/main/mutations/page-update.tsindex 0767efa0..3139a90c 100644--- a/apps/desktop/src/main/mutations/page-update.ts+++ b/apps/desktop/src/main/mutations/page-update.ts@@ -1,9 +1,9 @@+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {PageUpdateMutationInput,PageUpdateMutationOutput,} from '@/shared/mutations/page-update';-import { nodeService } from '@/main/services/node-service';export class PageUpdateMutationHandlerimplements MutationHandler<PageUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/record-create.ts b/apps/desktop/src/main/mutations/record-create.tsindex a082ca7b..31fb9516 100644--- a/apps/desktop/src/main/mutations/record-create.ts+++ b/apps/desktop/src/main/mutations/record-create.ts@@ -1,10 +1,11 @@import { generateId, IdType, RecordAttributes } from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {RecordCreateMutationInput,RecordCreateMutationOutput,} from '@/shared/mutations/record-create';-import { nodeService } from '@/main/services/node-service';export class RecordCreateMutationHandlerimplements MutationHandler<RecordCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/select-option-create.ts b/apps/desktop/src/main/mutations/select-option-create.tsindex 42860060..5c012106 100644--- a/apps/desktop/src/main/mutations/select-option-create.ts+++ b/apps/desktop/src/main/mutations/select-option-create.ts@@ -1,15 +1,16 @@import {+ compareString,generateId,- IdType,generateNodeIndex,- compareString,+ IdType,} from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {SelectOptionCreateMutationInput,SelectOptionCreateMutationOutput,} from '@/shared/mutations/select-option-create';-import { nodeService } from '@/main/services/node-service';export class SelectOptionCreateMutationHandlerimplements MutationHandler<SelectOptionCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/server-create.ts b/apps/desktop/src/main/mutations/server-create.tsindex 6bfbb9af..8bcb94ba 100644--- a/apps/desktop/src/main/mutations/server-create.ts+++ b/apps/desktop/src/main/mutations/server-create.ts@@ -1,11 +1,11 @@import { databaseService } from '@/main/data/database-service';+import { serverService } from '@/main/services/server-service';import { MutationHandler } from '@/main/types';+import { eventBus } from '@/shared/lib/event-bus';import {ServerCreateMutationInput,ServerCreateMutationOutput,} from '@/shared/mutations/server-create';-import { eventBus } from '@/shared/lib/event-bus';-import { serverService } from '../services/server-service';export class ServerCreateMutationHandlerimplements MutationHandler<ServerCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/space-create.ts b/apps/desktop/src/main/mutations/space-create.tsindex e0156c7d..91206f42 100644--- a/apps/desktop/src/main/mutations/space-create.ts+++ b/apps/desktop/src/main/mutations/space-create.ts@@ -1,17 +1,18 @@import {+ ChannelAttributes,generateId,IdType,- ChannelAttributes,PageAttributes,SpaceAttributes,} from '@colanode/core';++import { databaseService } from '@/main/data/database-service';+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {SpaceCreateMutationInput,SpaceCreateMutationOutput,} from '@/shared/mutations/space-create';-import { nodeService } from '@/main/services/node-service';-import { databaseService } from '@/main/data/database-service';export class SpaceCreateMutationHandlerimplements MutationHandler<SpaceCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/space-update.ts b/apps/desktop/src/main/mutations/space-update.tsindex d080574a..4384080c 100644--- a/apps/desktop/src/main/mutations/space-update.ts+++ b/apps/desktop/src/main/mutations/space-update.ts@@ -1,9 +1,9 @@+import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {SpaceUpdateMutationInput,SpaceUpdateMutationOutput,} from '@/shared/mutations/space-update';-import { nodeService } from '@/main/services/node-service';export class SpaceUpdateMutationHandlerimplements MutationHandler<SpaceUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/view-create.ts b/apps/desktop/src/main/mutations/view-create.tsindex e845094a..6f497975 100644--- a/apps/desktop/src/main/mutations/view-create.ts+++ b/apps/desktop/src/main/mutations/view-create.ts@@ -1,15 +1,16 @@import {+ compareString,generateId,- IdType,generateNodeIndex,- compareString,+ IdType,} from '@colanode/core';++import { nodeService } from '@/main/services/node-service';import { MutationHandler } from '@/main/types';import {ViewCreateMutationInput,ViewCreateMutationOutput,} from '@/shared/mutations/view-create';-import { nodeService } from '@/main/services/node-service';export class ViewCreateMutationHandlerimplements MutationHandler<ViewCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/view-delete.ts b/apps/desktop/src/main/mutations/view-delete.tsindex 8943c291..51ba138a 100644--- a/apps/desktop/src/main/mutations/view-delete.ts+++ b/apps/desktop/src/main/mutations/view-delete.ts@@ -1,5 +1,5 @@-import { MutationHandler } from '@/main/types';import { nodeService } from '@/main/services/node-service';+import { MutationHandler } from '@/main/types';import {ViewDeleteMutationInput,ViewDeleteMutationOutput,diff --git a/apps/desktop/src/main/mutations/view-update.ts b/apps/desktop/src/main/mutations/view-update.tsindex 387c901e..2e17c27e 100644--- a/apps/desktop/src/main/mutations/view-update.ts+++ b/apps/desktop/src/main/mutations/view-update.ts@@ -1,5 +1,5 @@-import { MutationHandler } from '@/main/types';import { nodeService } from '@/main/services/node-service';+import { MutationHandler } from '@/main/types';import {ViewUpdateMutationInput,ViewUpdateMutationOutput,diff --git a/apps/desktop/src/main/mutations/workspace-create.ts b/apps/desktop/src/main/mutations/workspace-create.tsindex 3118513a..d1d5fa2f 100644--- a/apps/desktop/src/main/mutations/workspace-create.ts+++ b/apps/desktop/src/main/mutations/workspace-create.ts@@ -1,12 +1,13 @@+import { WorkspaceOutput } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';+import { MutationHandler } from '@/main/types';+import { eventBus } from '@/shared/lib/event-bus';import { httpClient } from '@/shared/lib/http-client';import {WorkspaceCreateMutationInput,WorkspaceCreateMutationOutput,} from '@/shared/mutations/workspace-create';-import { MutationHandler } from '@/main/types';-import { WorkspaceOutput } from '@colanode/core';-import { eventBus } from '@/shared/lib/event-bus';export class WorkspaceCreateMutationHandlerimplements MutationHandler<WorkspaceCreateMutationInput>diff --git a/apps/desktop/src/main/mutations/workspace-update.ts b/apps/desktop/src/main/mutations/workspace-update.tsindex 9e737056..56d791dd 100644--- a/apps/desktop/src/main/mutations/workspace-update.ts+++ b/apps/desktop/src/main/mutations/workspace-update.ts@@ -1,12 +1,12 @@import { databaseService } from '@/main/data/database-service';+import { MutationHandler } from '@/main/types';+import { eventBus } from '@/shared/lib/event-bus';import { httpClient } from '@/shared/lib/http-client';import {WorkspaceUpdateMutationInput,WorkspaceUpdateMutationOutput,} from '@/shared/mutations/workspace-update';-import { MutationHandler } from '@/main/types';import { Workspace } from '@/shared/types/workspaces';-import { eventBus } from '@/shared/lib/event-bus';export class WorkspaceUpdateMutationHandlerimplements MutationHandler<WorkspaceUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/workspace-user-role-update.ts b/apps/desktop/src/main/mutations/workspace-user-role-update.tsindex b4a576cf..2b52f5a3 100644--- a/apps/desktop/src/main/mutations/workspace-user-role-update.ts+++ b/apps/desktop/src/main/mutations/workspace-user-role-update.ts@@ -1,11 +1,12 @@+import { WorkspaceUserRoleUpdateOutput } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';+import { MutationHandler } from '@/main/types';import { httpClient } from '@/shared/lib/http-client';import {WorkspaceUserRoleUpdateMutationInput,WorkspaceUserRoleUpdateMutationOutput,} from '@/shared/mutations/workspace-user-role-update';-import { WorkspaceUserRoleUpdateOutput } from '@colanode/core';-import { MutationHandler } from '@/main/types';export class WorkspaceUserRoleUpdateMutationHandlerimplements MutationHandler<WorkspaceUserRoleUpdateMutationInput>diff --git a/apps/desktop/src/main/mutations/workspace-users-invite.ts b/apps/desktop/src/main/mutations/workspace-users-invite.tsindex 6497004b..c49e0688 100644--- a/apps/desktop/src/main/mutations/workspace-users-invite.ts+++ b/apps/desktop/src/main/mutations/workspace-users-invite.ts@@ -1,11 +1,12 @@+import { WorkspaceUsersInviteOutput } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';+import { MutationHandler } from '@/main/types';import { httpClient } from '@/shared/lib/http-client';import {WorkspaceUsersInviteMutationInput,WorkspaceUsersInviteMutationOutput,} from '@/shared/mutations/workspace-users-invite';-import { MutationHandler } from '@/main/types';-import { WorkspaceUsersInviteOutput } from '@colanode/core';export class WorkspaceUsersInviteMutationHandlerimplements MutationHandler<WorkspaceUsersInviteMutationInput>diff --git a/apps/desktop/src/main/queries/account-get.ts b/apps/desktop/src/main/queries/account-get.tsindex 28f731b9..46de0468 100644--- a/apps/desktop/src/main/queries/account-get.ts+++ b/apps/desktop/src/main/queries/account-get.ts@@ -1,10 +1,10 @@-import { databaseService } from '@/main/data/database-service';-import { Account } from '@/shared/types/accounts';import { SelectAccount } from '@/main/data/app/schema';+import { databaseService } from '@/main/data/database-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { Event } from '@/shared/types/events';import { mapAccount } from '@/main/utils';import { AccountGetQueryInput } from '@/shared/queries/account-get';+import { Account } from '@/shared/types/accounts';+import { Event } from '@/shared/types/events';export class AccountGetQueryHandlerimplements QueryHandler<AccountGetQueryInput>diff --git a/apps/desktop/src/main/queries/accounts-list.ts b/apps/desktop/src/main/queries/accounts-list.tsindex 4e85e782..732a30c3 100644--- a/apps/desktop/src/main/queries/accounts-list.ts+++ b/apps/desktop/src/main/queries/accounts-list.ts@@ -1,10 +1,10 @@-import { AccountListQueryInput } from '@/shared/queries/account-list';-import { databaseService } from '@/main/data/database-service';-import { Account } from '@/shared/types/accounts';import { SelectAccount } from '@/main/data/app/schema';+import { databaseService } from '@/main/data/database-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { Event } from '@/shared/types/events';import { mapAccount } from '@/main/utils';+import { AccountListQueryInput } from '@/shared/queries/account-list';+import { Account } from '@/shared/types/accounts';+import { Event } from '@/shared/types/events';export class AccountListQueryHandlerimplements QueryHandler<AccountListQueryInput>diff --git a/apps/desktop/src/main/queries/download-get.ts b/apps/desktop/src/main/queries/download-get.tsindex ebacb82d..0043c32b 100644--- a/apps/desktop/src/main/queries/download-get.ts+++ b/apps/desktop/src/main/queries/download-get.ts@@ -1,10 +1,10 @@-import { DownloadGetQueryInput } from '@/shared/queries/download-get';import { databaseService } from '@/main/data/database-service';-import { Download } from '@/shared/types/nodes';+import { SelectDownload } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';import { mapDownload } from '@/main/utils';+import { DownloadGetQueryInput } from '@/shared/queries/download-get';import { Event } from '@/shared/types/events';-import { SelectDownload } from '@/main/data/workspace/schema';+import { Download } from '@/shared/types/nodes';export class DownloadGetQueryHandlerimplements QueryHandler<DownloadGetQueryInput>diff --git a/apps/desktop/src/main/queries/file-list.ts b/apps/desktop/src/main/queries/file-list.tsindex 2a742430..84c1ccbb 100644--- a/apps/desktop/src/main/queries/file-list.ts+++ b/apps/desktop/src/main/queries/file-list.ts@@ -1,10 +1,11 @@-import { FileListQueryInput } from '@/shared/queries/file-list';+import { compareString,FileNode } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { FileNode, compareString } from '@colanode/core';-import { Event } from '@/shared/types/events';import { SelectNode } from '@/main/data/workspace/schema';+import { ChangeCheckResult, QueryHandler } from '@/main/types';import { mapNode } from '@/main/utils';+import { FileListQueryInput } from '@/shared/queries/file-list';+import { Event } from '@/shared/types/events';export class FileListQueryHandler implements QueryHandler<FileListQueryInput> {public async handleQuery(input: FileListQueryInput): Promise<FileNode[]> {diff --git a/apps/desktop/src/main/queries/file-metadata-get.ts b/apps/desktop/src/main/queries/file-metadata-get.tsindex 0ee5d5f3..570eb5d3 100644--- a/apps/desktop/src/main/queries/file-metadata-get.ts+++ b/apps/desktop/src/main/queries/file-metadata-get.ts@@ -1,8 +1,8 @@+import { fileService } from '@/main/services/file-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';import { FileMetadataGetQueryInput } from '@/shared/queries/file-metadata-get';import { Event } from '@/shared/types/events';import { FileMetadata } from '@/shared/types/files';-import { fileService } from '@/main/services/file-service';export class FileMetadataGetQueryHandlerimplements QueryHandler<FileMetadataGetQueryInput>diff --git a/apps/desktop/src/main/queries/icons-get.ts b/apps/desktop/src/main/queries/icons-get.tsindex 6ecf8d01..218f3631 100644--- a/apps/desktop/src/main/queries/icons-get.ts+++ b/apps/desktop/src/main/queries/icons-get.ts@@ -1,8 +1,8 @@import { assetService } from '@/main/services/asset-service';-import { QueryHandler, ChangeCheckResult } from '@/main/types';+import { ChangeCheckResult,QueryHandler } from '@/main/types';import { IconsGetQueryInput } from '@/shared/queries/icons-get';-import { IconData } from '@/shared/types/icons';import { Event } from '@/shared/types/events';+import { IconData } from '@/shared/types/icons';export class IconsGetQueryHandler implements QueryHandler<IconsGetQueryInput> {public async handleQuery(_: IconsGetQueryInput): Promise<IconData> {diff --git a/apps/desktop/src/main/queries/index.ts b/apps/desktop/src/main/queries/index.tsindex bfdfea60..33fd53a6 100644--- a/apps/desktop/src/main/queries/index.ts+++ b/apps/desktop/src/main/queries/index.ts@@ -1,23 +1,23 @@-import { QueryMap } from '@/shared/queries';-import { QueryHandler } from '@/main/types';+import { AccountGetQueryHandler } from '@/main/queries/account-get';import { AccountListQueryHandler } from '@/main/queries/accounts-list';+import { DownloadGetQueryHandler } from '@/main/queries/download-get';+import { EmojisGetQueryHandler } from '@/main/queries/emojis-get';+import { FileListQueryHandler } from '@/main/queries/file-list';+import { FileMetadataGetQueryHandler } from '@/main/queries/file-metadata-get';+import { IconsGetQueryHandler } from '@/main/queries/icons-get';import { MessageListQueryHandler } from '@/main/queries/message-list';+import { NodeChildrenGetQueryHandler } from '@/main/queries/node-children-get';import { NodeGetQueryHandler } from '@/main/queries/node-get';+import { NodeTreeGetQueryHandler } from '@/main/queries/node-tree-get';+import { RadarDataGetQueryHandler } from '@/main/queries/radar-data-get';+import { RecordListQueryHandler } from '@/main/queries/record-list';import { ServerListQueryHandler } from '@/main/queries/server-list';import { UserSearchQueryHandler } from '@/main/queries/user-search';+import { WorkspaceGetQueryHandler } from '@/main/queries/workspace-get';import { WorkspaceListQueryHandler } from '@/main/queries/workspace-list';import { WorkspaceUserListQueryHandler } from '@/main/queries/workspace-user-list';-import { RecordListQueryHandler } from '@/main/queries/record-list';-import { FileListQueryHandler } from '@/main/queries/file-list';-import { EmojisGetQueryHandler } from '@/main/queries/emojis-get';-import { IconsGetQueryHandler } from '@/main/queries/icons-get';-import { NodeTreeGetQueryHandler } from '@/main/queries/node-tree-get';-import { NodeChildrenGetQueryHandler } from '@/main/queries/node-children-get';-import { RadarDataGetQueryHandler } from '@/main/queries/radar-data-get';-import { FileMetadataGetQueryHandler } from '@/main/queries/file-metadata-get';-import { AccountGetQueryHandler } from '@/main/queries/account-get';-import { WorkspaceGetQueryHandler } from '@/main/queries/workspace-get';-import { DownloadGetQueryHandler } from '@/main/queries/download-get';+import { QueryHandler } from '@/main/types';+import { QueryMap } from '@/shared/queries';type QueryHandlerMap = {[K in keyof QueryMap]: QueryHandler<QueryMap[K]['input']>;diff --git a/apps/desktop/src/main/queries/message-list.ts b/apps/desktop/src/main/queries/message-list.tsindex 735c7a4d..54b3c211 100644--- a/apps/desktop/src/main/queries/message-list.ts+++ b/apps/desktop/src/main/queries/message-list.ts@@ -1,9 +1,10 @@-import { MessageListQueryInput } from '@/shared/queries/message-list';+import { compareString,MessageNode } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { ChangeCheckResult, QueryHandler } from '@/main/types';import { SelectNode } from '@/main/data/workspace/schema';-import { MessageNode, compareString } from '@colanode/core';+import { ChangeCheckResult, QueryHandler } from '@/main/types';import { mapNode } from '@/main/utils';+import { MessageListQueryInput } from '@/shared/queries/message-list';import { Event } from '@/shared/types/events';export class MessageListQueryHandlerdiff --git a/apps/desktop/src/main/queries/node-children-get.ts b/apps/desktop/src/main/queries/node-children-get.tsindex b113fbe4..e3f04386 100644--- a/apps/desktop/src/main/queries/node-children-get.ts+++ b/apps/desktop/src/main/queries/node-children-get.ts@@ -1,9 +1,10 @@-import { NodeChildrenGetQueryInput } from '@/shared/queries/node-children-get';+import { Node } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { mapNode } from '@/main/utils';import { SelectNode } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { Node } from '@colanode/core';+import { mapNode } from '@/main/utils';+import { NodeChildrenGetQueryInput } from '@/shared/queries/node-children-get';import { Event } from '@/shared/types/events';export class NodeChildrenGetQueryHandlerdiff --git a/apps/desktop/src/main/queries/node-get.ts b/apps/desktop/src/main/queries/node-get.tsindex a7a46826..d1b0f46d 100644--- a/apps/desktop/src/main/queries/node-get.ts+++ b/apps/desktop/src/main/queries/node-get.ts@@ -1,9 +1,10 @@-import { NodeGetQueryInput } from '@/shared/queries/node-get';+import { Node } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { mapNode } from '@/main/utils';import { SelectNode } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { Node } from '@colanode/core';+import { mapNode } from '@/main/utils';+import { NodeGetQueryInput } from '@/shared/queries/node-get';import { Event } from '@/shared/types/events';export class NodeGetQueryHandler implements QueryHandler<NodeGetQueryInput> {diff --git a/apps/desktop/src/main/queries/node-tree-get.ts b/apps/desktop/src/main/queries/node-tree-get.tsindex 618a2f4f..c31dee72 100644--- a/apps/desktop/src/main/queries/node-tree-get.ts+++ b/apps/desktop/src/main/queries/node-tree-get.ts@@ -1,10 +1,11 @@+import { Node } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { mapNode, fetchNodeAncestors } from '@/main/utils';import { SelectNode } from '@/main/data/workspace/schema';import { ChangeCheckResult, QueryHandler } from '@/main/types';+import { fetchNodeAncestors,mapNode } from '@/main/utils';import { NodeTreeGetQueryInput } from '@/shared/queries/node-tree-get';import { Event } from '@/shared/types/events';-import { Node } from '@colanode/core';export class NodeTreeGetQueryHandlerimplements QueryHandler<NodeTreeGetQueryInput>diff --git a/apps/desktop/src/main/queries/radar-data-get.ts b/apps/desktop/src/main/queries/radar-data-get.tsindex 3912a361..bcda6d32 100644--- a/apps/desktop/src/main/queries/radar-data-get.ts+++ b/apps/desktop/src/main/queries/radar-data-get.ts@@ -1,8 +1,8 @@import { radarService } from '@/main/services/radar-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';import { RadarDataGetQueryInput } from '@/shared/queries/radar-data-get';-import { WorkspaceRadarData } from '@/shared/types/radars';import { Event } from '@/shared/types/events';+import { WorkspaceRadarData } from '@/shared/types/radars';export class RadarDataGetQueryHandlerimplements QueryHandler<RadarDataGetQueryInput>diff --git a/apps/desktop/src/main/queries/record-list.ts b/apps/desktop/src/main/queries/record-list.tsindex 48da3f21..ca245f35 100644--- a/apps/desktop/src/main/queries/record-list.ts+++ b/apps/desktop/src/main/queries/record-list.ts@@ -1,29 +1,30 @@-import { RecordListQueryInput } from '@/shared/queries/record-list';-import { databaseService } from '@/main/data/database-service';-import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { SelectNode } from '@/main/data/workspace/schema';-import { sql } from 'kysely';import {BooleanFieldAttributes,CreatedAtFieldAttributes,+ DatabaseNode,DateFieldAttributes,EmailFieldAttributes,FieldAttributes,+ isStringArray,MultiSelectFieldAttributes,+ NodeTypes,NumberFieldAttributes,PhoneFieldAttributes,+ RecordNode,SelectFieldAttributes,TextFieldAttributes,UrlFieldAttributes,ViewFieldFilterAttributes,ViewFilterAttributes,ViewSortAttributes,- DatabaseNode,- RecordNode,- isStringArray,- NodeTypes,} from '@colanode/core';+import { sql } from 'kysely';++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 { RecordListQueryInput } from '@/shared/queries/record-list';import { Event } from '@/shared/types/events';export class RecordListQueryHandlerdiff --git a/apps/desktop/src/main/queries/server-list.ts b/apps/desktop/src/main/queries/server-list.tsindex 03656dad..ecefd2de 100644--- a/apps/desktop/src/main/queries/server-list.ts+++ b/apps/desktop/src/main/queries/server-list.ts@@ -1,9 +1,9 @@-import { ServerListQueryInput } from '@/shared/queries/server-list';-import { databaseService } from '@/main/data/database-service';import { SelectServer } from '@/main/data/app/schema';+import { databaseService } from '@/main/data/database-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { Server } from '@/shared/types/servers';+import { ServerListQueryInput } from '@/shared/queries/server-list';import { Event } from '@/shared/types/events';+import { Server } from '@/shared/types/servers';export class ServerListQueryHandlerimplements QueryHandler<ServerListQueryInput>diff --git a/apps/desktop/src/main/queries/user-search.ts b/apps/desktop/src/main/queries/user-search.tsindex 972a8132..eb4042dd 100644--- a/apps/desktop/src/main/queries/user-search.ts+++ b/apps/desktop/src/main/queries/user-search.ts@@ -1,10 +1,11 @@-import { UserSearchQueryInput } from '@/shared/queries/user-search';-import { databaseService } from '@/main/data/database-service';+import { NodeTypes, UserNode } from '@colanode/core';import { sql } from 'kysely';++import { databaseService } from '@/main/data/database-service';import { SelectNode } from '@/main/data/workspace/schema';-import { NodeTypes, UserNode } from '@colanode/core';import { ChangeCheckResult, QueryHandler } from '@/main/types';import { mapNode } from '@/main/utils';+import { UserSearchQueryInput } from '@/shared/queries/user-search';import { Event } from '@/shared/types/events';export class UserSearchQueryHandlerdiff --git a/apps/desktop/src/main/queries/workspace-get.ts b/apps/desktop/src/main/queries/workspace-get.tsindex 7a145239..6a61c897 100644--- a/apps/desktop/src/main/queries/workspace-get.ts+++ b/apps/desktop/src/main/queries/workspace-get.ts@@ -1,9 +1,9 @@-import { databaseService } from '@/main/data/database-service';import { SelectWorkspace } from '@/main/data/app/schema';+import { databaseService } from '@/main/data/database-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { Event } from '@/shared/types/events';import { mapWorkspace } from '@/main/utils';import { WorkspaceGetQueryInput } from '@/shared/queries/workspace-get';+import { Event } from '@/shared/types/events';import { Workspace } from '@/shared/types/workspaces';export class WorkspaceGetQueryHandlerdiff --git a/apps/desktop/src/main/queries/workspace-list.ts b/apps/desktop/src/main/queries/workspace-list.tsindex 03373a7e..10df7de5 100644--- a/apps/desktop/src/main/queries/workspace-list.ts+++ b/apps/desktop/src/main/queries/workspace-list.ts@@ -1,10 +1,10 @@-import { WorkspaceListQueryInput } from '@/shared/queries/workspace-list';-import { databaseService } from '@/main/data/database-service';-import { Workspace } from '@/shared/types/workspaces';import { SelectWorkspace } from '@/main/data/app/schema';+import { databaseService } from '@/main/data/database-service';import { ChangeCheckResult, QueryHandler } from '@/main/types';-import { Event } from '@/shared/types/events';import { mapWorkspace } from '@/main/utils';+import { WorkspaceListQueryInput } from '@/shared/queries/workspace-list';+import { Event } from '@/shared/types/events';+import { Workspace } from '@/shared/types/workspaces';export class WorkspaceListQueryHandlerimplements QueryHandler<WorkspaceListQueryInput>diff --git a/apps/desktop/src/main/queries/workspace-user-list.ts b/apps/desktop/src/main/queries/workspace-user-list.tsindex ab125243..353924d1 100644--- a/apps/desktop/src/main/queries/workspace-user-list.ts+++ b/apps/desktop/src/main/queries/workspace-user-list.ts@@ -1,9 +1,10 @@-import { WorkspaceUserListQueryInput } from '@/shared/queries/workspace-user-list';-import { databaseService } from '@/main/data/database-service';import { NodeTypes, UserNode } from '@colanode/core';-import { mapNode } from '@/main/utils';++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 { WorkspaceUserListQueryInput } from '@/shared/queries/workspace-user-list';import { Event } from '@/shared/types/events';export class WorkspaceUserListQueryHandlerdiff --git a/apps/desktop/src/main/services/account-service.ts b/apps/desktop/src/main/services/account-service.tsindex 136d8282..bc2b9863 100644--- a/apps/desktop/src/main/services/account-service.ts+++ b/apps/desktop/src/main/services/account-service.ts@@ -1,17 +1,18 @@+import { AccountSyncOutput } from '@colanode/core';import fs from 'fs';-import { databaseService } from '@/main/data/database-service';+import { SelectAccount } from '@/main/data/app/schema';-import { AccountSyncOutput } from '@colanode/core';-import { httpClient } from '@/shared/lib/http-client';+import { databaseService } from '@/main/data/database-service';+import { createLogger } from '@/main/logger';+import { serverService } from '@/main/services/server-service';import {+ getAccountAvatarsDirectoryPath,getWorkspaceDirectoryPath,mapAccount,mapWorkspace,- getAccountAvatarsDirectoryPath,} from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';-import { serverService } from '@/main/services/server-service';-import { createLogger } from '@/main/logger';+import { httpClient } from '@/shared/lib/http-client';class AccountService {private readonly logger = createLogger('account-service');diff --git a/apps/desktop/src/main/services/asset-service.ts b/apps/desktop/src/main/services/asset-service.tsindex 11e700b5..9065de19 100644--- a/apps/desktop/src/main/services/asset-service.ts+++ b/apps/desktop/src/main/services/asset-service.ts@@ -1,11 +1,12 @@+import unzipper from 'unzipper';import { app, net } from 'electron';-import path from 'path';import fs from 'fs';-import unzipper from 'unzipper';-import { EmojiData } from '@/shared/types/emojis';-import { IconData } from '@/shared/types/icons';+import path from 'path';+import { createLogger } from '@/main/logger';import { getAssetsSourcePath } from '@/main/utils';+import { EmojiData } from '@/shared/types/emojis';+import { IconData } from '@/shared/types/icons';type AssetsVersion = {date: string;diff --git a/apps/desktop/src/main/services/avatar-service.ts b/apps/desktop/src/main/services/avatar-service.tsindex e62f000d..bd8a5ee8 100644--- a/apps/desktop/src/main/services/avatar-service.ts+++ b/apps/desktop/src/main/services/avatar-service.ts@@ -1,10 +1,11 @@import { net } from 'electron';-import path from 'path';import fs from 'fs';+import path from 'path';+import { databaseService } from '@/main/data/database-service';-import { httpClient } from '@/shared/lib/http-client';-import { getAccountAvatarsDirectoryPath } from '@/main/utils';import { createLogger } from '@/main/logger';+import { getAccountAvatarsDirectoryPath } from '@/main/utils';+import { httpClient } from '@/shared/lib/http-client';class AvatarService {private readonly logger = createLogger('avatar-service');diff --git a/apps/desktop/src/main/services/collaboration-service.ts b/apps/desktop/src/main/services/collaboration-service.tsindex 0b33a8a5..90dfe3f5 100644--- a/apps/desktop/src/main/services/collaboration-service.ts+++ b/apps/desktop/src/main/services/collaboration-service.ts@@ -2,9 +2,10 @@ import {ServerCollaboration,ServerCollaborationRevocation,} from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { eventBus } from '@/shared/lib/event-bus';import { createLogger } from '@/main/logger';+import { eventBus } from '@/shared/lib/event-bus';class CollaborationService {private readonly logger = createLogger('collaboration-service');diff --git a/apps/desktop/src/main/services/command-service.ts b/apps/desktop/src/main/services/command-service.tsindex 38c5bfb2..408858fd 100644--- a/apps/desktop/src/main/services/command-service.ts+++ b/apps/desktop/src/main/services/command-service.ts@@ -1,7 +1,7 @@-import { CommandInput, CommandMap } from '@/shared/commands';-import { createLogger } from '@/main/logger';import { commandHandlerMap } from '@/main/commands';+import { createLogger } from '@/main/logger';import { CommandHandler } from '@/main/types';+import { CommandInput, CommandMap } from '@/shared/commands';class CommandService {private readonly logger = createLogger('command-service');diff --git a/apps/desktop/src/main/services/file-service.ts b/apps/desktop/src/main/services/file-service.tsindex 8d9ce997..d30ce9cc 100644--- a/apps/desktop/src/main/services/file-service.ts+++ b/apps/desktop/src/main/services/file-service.ts@@ -1,12 +1,3 @@-import { net, shell } from 'electron';-import path from 'path';-import fs from 'fs';-import axios from 'axios';-import mime from 'mime-types';-import { FileMetadata } from '@/shared/types/files';-import { databaseService } from '@/main/data/database-service';-import { httpClient } from '@/shared/lib/http-client';-import { getWorkspaceFilesDirectoryPath } from '@/main/utils';import {CompleteUploadOutput,CreateDownloadOutput,@@ -14,9 +5,19 @@ import {extractFileType,FileAttributes,} from '@colanode/core';-import { eventBus } from '@/shared/lib/event-bus';-import { serverService } from '@/main/services/server-service';+import axios from 'axios';+import mime from 'mime-types';+import { net, shell } from 'electron';+import fs from 'fs';+import path from 'path';++import { databaseService } from '@/main/data/database-service';import { createLogger } from '@/main/logger';+import { serverService } from '@/main/services/server-service';+import { getWorkspaceFilesDirectoryPath } from '@/main/utils';+import { eventBus } from '@/shared/lib/event-bus';+import { httpClient } from '@/shared/lib/http-client';+import { FileMetadata } from '@/shared/types/files';type WorkspaceFileState = {isUploading: boolean;diff --git a/apps/desktop/src/main/services/interaction-service.ts b/apps/desktop/src/main/services/interaction-service.tsindex d3ff1e81..38b7f3c2 100644--- a/apps/desktop/src/main/services/interaction-service.ts+++ b/apps/desktop/src/main/services/interaction-service.ts@@ -7,10 +7,11 @@ import {NodeType,ServerInteraction,} from '@colanode/core';+import { databaseService } from '@/main/data/database-service';import { SelectInteractionEvent } from '@/main/data/workspace/schema';+import { mapInteraction } from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';-import { mapInteraction } from '../utils';const UPDATE_RETRIES_COUNT = 10;diff --git a/apps/desktop/src/main/services/mutation-service.ts b/apps/desktop/src/main/services/mutation-service.tsindex 9bf6ba3e..a7c86a5f 100644--- a/apps/desktop/src/main/services/mutation-service.ts+++ b/apps/desktop/src/main/services/mutation-service.ts@@ -1,7 +1,7 @@-import { MutationInput, MutationMap } from '@/shared/mutations';+import { createLogger } from '@/main/logger';import { mutationHandlerMap } from '@/main/mutations';import { MutationHandler } from '@/main/types';-import { createLogger } from '@/main/logger';+import { MutationInput, MutationMap } from '@/shared/mutations';class MutationService {private readonly logger = createLogger('mutation-service');diff --git a/apps/desktop/src/main/services/node-service.ts b/apps/desktop/src/main/services/node-service.tsindex 2706c706..d9dee999 100644--- a/apps/desktop/src/main/services/node-service.ts+++ b/apps/desktop/src/main/services/node-service.ts@@ -1,5 +1,6 @@-import { sql } from 'kysely';import {+ generateId,+ IdType,Node,NodeAttributes,NodeMutationContext,@@ -8,18 +9,12 @@ import {ServerNodeDeleteTransaction,ServerNodeTransaction,ServerNodeUpdateTransaction,- generateId,- IdType,} from '@colanode/core';import { decodeState, YDoc } from '@colanode/crdt';+import { sql } from 'kysely';++import { SelectWorkspace } from '@/main/data/app/schema';import { databaseService } from '@/main/data/database-service';-import {- fetchNodeAncestors,- mapDownload,- mapNode,- mapTransaction,- mapUpload,-} from '@/main/utils';import {CreateDownload,CreateUpload,@@ -28,10 +23,16 @@ import {SelectNodeTransaction,SelectUpload,} from '@/main/data/workspace/schema';-import { eventBus } from '@/shared/lib/event-bus';-import { SelectWorkspace } from '@/main/data/app/schema';-import { interactionService } from '@/main/services/interaction-service';import { createLogger } from '@/main/logger';+import { interactionService } from '@/main/services/interaction-service';+import {+ fetchNodeAncestors,+ mapDownload,+ mapNode,+ mapTransaction,+ mapUpload,+} from '@/main/utils';+import { eventBus } from '@/shared/lib/event-bus';export type CreateNodeInput = {id: string;diff --git a/apps/desktop/src/main/services/notification-service.ts b/apps/desktop/src/main/services/notification-service.tsindex f3ae2206..6ae25f68 100644--- a/apps/desktop/src/main/services/notification-service.ts+++ b/apps/desktop/src/main/services/notification-service.ts@@ -1,6 +1,7 @@import { app } from 'electron';-import { eventBus } from '@/shared/lib/event-bus';+import { radarService } from '@/main/services/radar-service';+import { eventBus } from '@/shared/lib/event-bus';class NotificationService {constructor() {diff --git a/apps/desktop/src/main/services/query-service.ts b/apps/desktop/src/main/services/query-service.tsindex af1a2a42..51506391 100644--- a/apps/desktop/src/main/services/query-service.ts+++ b/apps/desktop/src/main/services/query-service.ts@@ -1,10 +1,11 @@-import { QueryInput, QueryMap } from '@/shared/queries';-import { QueryHandler, SubscribedQuery } from '@/main/types';+import { isEqual } from 'lodash-es';++import { createLogger } from '@/main/logger';import { queryHandlerMap } from '@/main/queries';+import { QueryHandler, SubscribedQuery } from '@/main/types';import { eventBus } from '@/shared/lib/event-bus';+import { QueryInput, QueryMap } from '@/shared/queries';import { Event } from '@/shared/types/events';-import { isEqual } from 'lodash-es';-import { createLogger } from '@/main/logger';class QueryService {private readonly logger = createLogger('query-service');diff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.tsindex 41ec09d9..81e2b70c 100644--- a/apps/desktop/src/main/services/radar-service.ts+++ b/apps/desktop/src/main/services/radar-service.ts@@ -1,8 +1,9 @@+import { getIdType, IdType } from '@colanode/core';+import { databaseService } from '@/main/data/database-service';-import { WorkspaceRadarData } from '@/shared/types/radars';import { eventBus } from '@/shared/lib/event-bus';import { Event } from '@/shared/types/events';-import { getIdType, IdType } from '@colanode/core';+import { WorkspaceRadarData } from '@/shared/types/radars';class RadarService {private readonly workspaceStates: Map<string, WorkspaceRadarData> = new Map();diff --git a/apps/desktop/src/main/services/server-service.ts b/apps/desktop/src/main/services/server-service.tsindex 4bf83624..0c5a88c7 100644--- a/apps/desktop/src/main/services/server-service.ts+++ b/apps/desktop/src/main/services/server-service.ts@@ -1,10 +1,11 @@-import axios from 'axios';-import { Server } from '@/shared/types/servers';import { ServerConfig } from '@colanode/core';+import axios from 'axios';+import { databaseService } from '@/main/data/database-service';+import { createLogger } from '@/main/logger';import { mapServer } from '@/main/utils';import { eventBus } from '@/shared/lib/event-bus';-import { createLogger } from '@/main/logger';+import { Server } from '@/shared/types/servers';type ServerState = {isAvailable: boolean;diff --git a/apps/desktop/src/main/services/socket-connection.ts b/apps/desktop/src/main/services/socket-connection.tsindex 35db9682..aefed022 100644--- a/apps/desktop/src/main/services/socket-connection.ts+++ b/apps/desktop/src/main/services/socket-connection.ts@@ -1,10 +1,11 @@-import { WebSocket } from 'ws';-import { BackoffCalculator } from '@/shared/lib/backoff-calculator';import { Message } from '@colanode/core';+import { WebSocket } from 'ws';+import { SelectAccount } from '@/main/data/app/schema';+import { createLogger } from '@/main/logger';import { syncService } from '@/main/services/sync-service';+import { BackoffCalculator } from '@/shared/lib/backoff-calculator';import { eventBus } from '@/shared/lib/event-bus';-import { createLogger } from '@/main/logger';export class SocketConnection {private readonly logger = createLogger('socket-connection');diff --git a/apps/desktop/src/main/services/socket-service.ts b/apps/desktop/src/main/services/socket-service.tsindex 01a0fe45..115c6dd9 100644--- a/apps/desktop/src/main/services/socket-service.ts+++ b/apps/desktop/src/main/services/socket-service.ts@@ -1,9 +1,10 @@-import { SocketConnection } from '@/main/services/socket-connection';-import { databaseService } from '@/main/data/database-service';import { Message } from '@colanode/core';++import { databaseService } from '@/main/data/database-service';+import { createLogger } from '@/main/logger';import { serverService } from '@/main/services/server-service';+import { SocketConnection } from '@/main/services/socket-connection';import { eventBus } from '@/shared/lib/event-bus';-import { createLogger } from '@/main/logger';class SocketService {private readonly logger = createLogger('socket-service');diff --git a/apps/desktop/src/main/services/sync-service.ts b/apps/desktop/src/main/services/sync-service.tsindex 7ad6bc95..8d449a66 100644--- a/apps/desktop/src/main/services/sync-service.ts+++ b/apps/desktop/src/main/services/sync-service.ts@@ -1,32 +1,33 @@-import { databaseService } from '@/main/data/database-service';-import { mapTransaction } from '@/main/utils';-import { eventBus } from '@/shared/lib/event-bus';-import { httpClient } from '@/shared/lib/http-client';-import { serverService } from '@/main/services/server-service';import {- InteractionsBatchMessage,CollaborationRevocationsBatchMessage,CollaborationsBatchMessage,- FetchInteractionsMessage,FetchCollaborationRevocationsMessage,FetchCollaborationsMessage,+ FetchInteractionsMessage,FetchNodeTransactionsMessage,GetNodeTransactionsOutput,+ InteractionsBatchMessage,LocalNodeTransaction,NodeTransactionsBatchMessage,SyncInteractionsMessage,SyncNodeTransactionsOutput,} from '@colanode/core';-import { createLogger } from '@/main/logger';-import { nodeService } from '@/main/services/node-service';-import { socketService } from '@/main/services/socket-service';-import { collaborationService } from '@/main/services/collaboration-service';-import { interactionService } from '@/main/services/interaction-service';+import { sql } from 'kysely';++import { databaseService } from '@/main/data/database-service';import {SelectInteractionEvent,SelectNodeTransaction,} from '@/main/data/workspace/schema';-import { sql } from 'kysely';+import { createLogger } from '@/main/logger';+import { collaborationService } from '@/main/services/collaboration-service';+import { interactionService } from '@/main/services/interaction-service';+import { nodeService } from '@/main/services/node-service';+import { serverService } from '@/main/services/server-service';+import { socketService } from '@/main/services/socket-service';+import { mapTransaction } from '@/main/utils';+import { eventBus } from '@/shared/lib/event-bus';+import { httpClient } from '@/shared/lib/http-client';type WorkspaceSyncState = {isSyncing: boolean;diff --git a/apps/desktop/src/main/types.ts b/apps/desktop/src/main/types.tsindex c806eaa6..0f6eef9c 100644--- a/apps/desktop/src/main/types.ts+++ b/apps/desktop/src/main/types.ts@@ -1,4 +1,4 @@-import { CommandMap, CommandInput } from '@/shared/commands';+import { CommandInput,CommandMap } from '@/shared/commands';import { MutationInput, MutationMap } from '@/shared/mutations';import { QueryInput, QueryMap } from '@/shared/queries';import { Event } from '@/shared/types/events';diff --git a/apps/desktop/src/main/utils.ts b/apps/desktop/src/main/utils.tsindex dc839f81..20fcf747 100644--- a/apps/desktop/src/main/utils.ts+++ b/apps/desktop/src/main/utils.ts@@ -1,4 +1,5 @@-import { app } from 'electron';+import { LocalNodeTransaction, Node } from '@colanode/core';+import { encodeState } from '@colanode/crdt';import {DeleteResult,InsertResult,@@ -6,27 +7,27 @@ import {Transaction,UpdateResult,} from 'kysely';+import { app } from 'electron';import path from 'path';++import {+ SelectAccount,+ SelectServer,+ SelectWorkspace,+} from '@/main/data/app/schema';import {- SelectInteraction,SelectDownload,+ SelectInteraction,SelectNode,SelectNodeTransaction,SelectUpload,WorkspaceDatabaseSchema,} from '@/main/data/workspace/schema';-import { LocalNodeTransaction, Node } from '@colanode/core';import { Account } from '@/shared/types/accounts';-import {- SelectAccount,- SelectServer,- SelectWorkspace,-} from './data/app/schema';-import { Workspace } from '@/shared/types/workspaces';-import { Server } from '@/shared/types/servers';-import { Download, Upload } from '@/shared/types/nodes';-import { encodeState } from '@colanode/crdt';import { Interaction } from '@/shared/types/interactions';+import { Download, Upload } from '@/shared/types/nodes';+import { Server } from '@/shared/types/servers';+import { Workspace } from '@/shared/types/workspaces';export const appPath = app.getPath('userData');diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.tsindex 3db06f9f..bd85c2a3 100644--- a/apps/desktop/src/preload.ts+++ b/apps/desktop/src/preload.ts@@ -1,10 +1,11 @@// See the Electron documentation for details on how to use preload scripts:// https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts-import { CommandMap, CommandInput } from '@/shared/commands';-import { MutationMap, MutationInput } from '@/shared/mutations';-import { QueryInput, QueryMap } from '@/shared/queries';import { contextBridge, ipcRenderer } from 'electron';++import { CommandInput,CommandMap } from '@/shared/commands';import { eventBus } from '@/shared/lib/event-bus';+import { MutationInput,MutationMap } from '@/shared/mutations';+import { QueryInput, QueryMap } from '@/shared/queries';import { Event } from '@/shared/types/events';contextBridge.exposeInMainWorld('colanode', {diff --git a/apps/desktop/src/renderer/app.tsx b/apps/desktop/src/renderer/app.tsxindex ea37d5e7..188a00cd 100644--- a/apps/desktop/src/renderer/app.tsx+++ b/apps/desktop/src/renderer/app.tsx@@ -1,4 +1,5 @@import { Outlet } from 'react-router-dom';+import { RadarProvider } from '@/renderer/radar-provider';export const App = () => {diff --git a/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsx b/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsxindex 4d639465..edf63fd5 100644--- a/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsx+++ b/apps/desktop/src/renderer/components/accounts/account-settings-dialog.tsx@@ -1,3 +1,8 @@+import { VisuallyHidden } from '@radix-ui/react-visually-hidden';+import { Info, Trash2 } from 'lucide-react';++import { AccountUpdate } from '@/renderer/components/accounts/account-update';+import { Avatar } from '@/renderer/components/avatars/avatar';import {Dialog,DialogContent,@@ -9,10 +14,6 @@ import {TabsList,TabsTrigger,} from '@/renderer/components/ui/tabs';-import { VisuallyHidden } from '@radix-ui/react-visually-hidden';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { Info, Trash2 } from 'lucide-react';-import { AccountUpdate } from '@/renderer/components/accounts/account-update';import { useAccount } from '@/renderer/contexts/account';interface AccountSettingsDialogProps {diff --git a/apps/desktop/src/renderer/components/accounts/account-update.tsx b/apps/desktop/src/renderer/components/accounts/account-update.tsxindex df02cde3..c8218321 100644--- a/apps/desktop/src/renderer/components/accounts/account-update.tsx+++ b/apps/desktop/src/renderer/components/accounts/account-update.tsx@@ -1,23 +1,24 @@+import { zodResolver } from '@hookform/resolvers/zod';+import { Upload } from 'lucide-react';import React from 'react';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { Button } from '@/renderer/components/ui/button';import {Form,+ FormControl,FormField,FormItem,FormLabel,- FormControl,FormMessage,} from '@/renderer/components/ui/form';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';-import { z } from 'zod';+import { Input } from '@/renderer/components/ui/input';+import { Spinner } from '@/renderer/components/ui/spinner';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';-import { Avatar } from '@/renderer/components/avatars/avatar';import { cn } from '@/shared/lib/utils';-import { Spinner } from '@/renderer/components/ui/spinner';-import { Upload } from 'lucide-react';-import { Input } from '@/renderer/components/ui/input';-import { Button } from '@/renderer/components/ui/button';import { Account } from '@/shared/types/accounts';const formSchema = z.object({diff --git a/apps/desktop/src/renderer/components/accounts/account.tsx b/apps/desktop/src/renderer/components/accounts/account.tsxindex 7b6fa6f4..45e020e1 100644--- a/apps/desktop/src/renderer/components/accounts/account.tsx+++ b/apps/desktop/src/renderer/components/accounts/account.tsx@@ -1,8 +1,9 @@import React from 'react';-import { AccountContext } from '@/renderer/contexts/account';import { Outlet, useNavigate, useParams } from 'react-router-dom';+import { AccountLogout } from '@/renderer/components/accounts/account-logout';import { AccountSettingsDialog } from '@/renderer/components/accounts/account-settings-dialog';+import { AccountContext } from '@/renderer/contexts/account';import { useQuery } from '@/renderer/hooks/use-query';export const Account = () => {diff --git a/apps/desktop/src/renderer/components/accounts/email-login.tsx b/apps/desktop/src/renderer/components/accounts/email-login.tsxindex eff2a3f8..47a504ee 100644--- a/apps/desktop/src/renderer/components/accounts/email-login.tsx+++ b/apps/desktop/src/renderer/components/accounts/email-login.tsx@@ -1,6 +1,10 @@-import { Input } from '@/renderer/components/ui/input';+import { zodResolver } from '@hookform/resolvers/zod';+import { Mail } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { useNavigate } from 'react-router-dom';+import { z } from 'zod';+import { Button } from '@/renderer/components/ui/button';-import { Spinner } from '@/renderer/components/ui/spinner';import {Form,FormControl,@@ -8,14 +12,11 @@ import {FormItem,FormMessage,} from '@/renderer/components/ui/form';-import { z } from 'zod';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';+import { Input } from '@/renderer/components/ui/input';+import { Spinner } from '@/renderer/components/ui/spinner';+import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';import { Server } from '@/shared/types/servers';-import { useMutation } from '@/renderer/hooks/use-mutation';-import { Mail } from 'lucide-react';-import { useNavigate } from 'react-router-dom';const formSchema = z.object({email: z.string().min(2).email(),diff --git a/apps/desktop/src/renderer/components/accounts/email-register.tsx b/apps/desktop/src/renderer/components/accounts/email-register.tsxindex 6ba92ead..98d1005f 100644--- a/apps/desktop/src/renderer/components/accounts/email-register.tsx+++ b/apps/desktop/src/renderer/components/accounts/email-register.tsx@@ -1,6 +1,10 @@-import { Input } from '@/renderer/components/ui/input';+import { zodResolver } from '@hookform/resolvers/zod';+import { Mail } from 'lucide-react';+import { useForm } from 'react-hook-form';+import { useNavigate } from 'react-router-dom';+import { z } from 'zod';+import { Button } from '@/renderer/components/ui/button';-import { Spinner } from '@/renderer/components/ui/spinner';import {Form,FormControl,@@ -8,14 +12,11 @@ import {FormItem,FormMessage,} from '@/renderer/components/ui/form';-import { z } from 'zod';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';-import { toast } from '@/renderer/hooks/use-toast';+import { Input } from '@/renderer/components/ui/input';+import { Spinner } from '@/renderer/components/ui/spinner';import { useMutation } from '@/renderer/hooks/use-mutation';+import { toast } from '@/renderer/hooks/use-toast';import { Server } from '@/shared/types/servers';-import { Mail } from 'lucide-react';-import { useNavigate } from 'react-router-dom';const formSchema = z.object({name: z.string().min(2),diff --git a/apps/desktop/src/renderer/components/accounts/login-form.tsx b/apps/desktop/src/renderer/components/accounts/login-form.tsxindex c05e792f..8808facc 100644--- a/apps/desktop/src/renderer/components/accounts/login-form.tsx+++ b/apps/desktop/src/renderer/components/accounts/login-form.tsx@@ -1,8 +1,9 @@import React from 'react';-import { EmailRegister } from '@/renderer/components/accounts/email-register';+import { useNavigate } from 'react-router-dom';+import { EmailLogin } from '@/renderer/components/accounts/email-login';+import { EmailRegister } from '@/renderer/components/accounts/email-register';import { ServerDropdown } from '@/renderer/components/servers/server-dropdown';-import { useNavigate } from 'react-router-dom';import { Separator } from '@/renderer/components/ui/separator';import { Account } from '@/shared/types/accounts';import { Server } from '@/shared/types/servers';diff --git a/apps/desktop/src/renderer/components/avatars/avatar-picker.tsx b/apps/desktop/src/renderer/components/avatars/avatar-picker.tsxindex 14a3cb67..afe8e977 100644--- a/apps/desktop/src/renderer/components/avatars/avatar-picker.tsx+++ b/apps/desktop/src/renderer/components/avatars/avatar-picker.tsx@@ -1,12 +1,12 @@+import { AvatarUpload } from '@/renderer/components/avatars/avatar-upload';+import { EmojiPicker } from '@/renderer/components/emojis/emoji-picker';+import { IconPicker } from '@/renderer/components/icons/icon-picker';import {Tabs,TabsContent,TabsList,TabsTrigger,} from '@/renderer/components/ui/tabs';-import { EmojiPicker } from '@/renderer/components/emojis/emoji-picker';-import { IconPicker } from '@/renderer/components/icons/icon-picker';-import { AvatarUpload } from '@/renderer/components/avatars/avatar-upload';interface AvatarPickerProps {onPick: (avatar: string) => void;diff --git a/apps/desktop/src/renderer/components/avatars/avatar-popover.tsx b/apps/desktop/src/renderer/components/avatars/avatar-popover.tsxindex 9ae3080f..f71b7e3a 100644--- a/apps/desktop/src/renderer/components/avatars/avatar-popover.tsx+++ b/apps/desktop/src/renderer/components/avatars/avatar-popover.tsx@@ -1,10 +1,11 @@import React from 'react';++import { AvatarPicker } from '@/renderer/components/avatars/avatar-picker';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { AvatarPicker } from './avatar-picker';interface AvatarPopoverProps {onPick: (avatar: string) => void;diff --git a/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx b/apps/desktop/src/renderer/components/avatars/avatar-upload.tsxindex 74d5444a..14b78a32 100644--- a/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx+++ b/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx@@ -1,8 +1,9 @@import React from 'react';+import { Button } from '@/renderer/components/ui/button';import { Spinner } from '@/renderer/components/ui/spinner';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useAccount } from '@/renderer/contexts/account';+import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';interface AvatarUploadProps {diff --git a/apps/desktop/src/renderer/components/avatars/avatar.tsx b/apps/desktop/src/renderer/components/avatars/avatar.tsxindex 7b64f1ba..c87183d4 100644--- a/apps/desktop/src/renderer/components/avatars/avatar.tsx+++ b/apps/desktop/src/renderer/components/avatars/avatar.tsx@@ -1,14 +1,15 @@-import { cn } from '@/shared/lib/utils';+import { getIdType, IdType } from '@colanode/core';++import { useAccount } from '@/renderer/contexts/account';import {getAvatarSizeClasses,getAvatarUrl,getColorForId,getDefaultNodeAvatar,} from '@/shared/lib/avatars';-import { getIdType, IdType } from '@colanode/core';import { getEmojiUrl } from '@/shared/lib/emojis';import { getIconUrl } from '@/shared/lib/icons';-import { useAccount } from '@/renderer/contexts/account';+import { cn } from '@/shared/lib/utils';interface AvatarProps {id: string;diff --git a/apps/desktop/src/renderer/components/channels/channel-body.tsx b/apps/desktop/src/renderer/components/channels/channel-body.tsxindex a3380768..4a020a2d 100644--- a/apps/desktop/src/renderer/components/channels/channel-body.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-body.tsx@@ -1,4 +1,5 @@import { ChannelNode, NodeRole } from '@colanode/core';+import { Conversation } from '@/renderer/components/messages/conversation';interface 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 e1645e86..7e5b2059 100644--- a/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx@@ -1,4 +1,5 @@import { ChannelNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';interface ChannelBreadcrumbItemProps {diff --git a/apps/desktop/src/renderer/components/channels/channel-container.tsx b/apps/desktop/src/renderer/components/channels/channel-container.tsxindex fd894765..f1780f86 100644--- a/apps/desktop/src/renderer/components/channels/channel-container.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-container.tsx@@ -1,8 +1,9 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';-import { ChannelHeader } from '@/renderer/components/channels/channel-header';import { extractNodeRole } from '@colanode/core';+import { ChannelBody } from '@/renderer/components/channels/channel-body';+import { ChannelHeader } from '@/renderer/components/channels/channel-header';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface ChannelContainerProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsxindex e6f0755c..0f08bbf7 100644--- a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx@@ -1,4 +1,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { generateId,IdType } from '@colanode/core';++import { ChannelForm } from '@/renderer/components/channels/channel-form';import {Dialog,DialogContent,@@ -6,9 +8,8 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { IdType, generateId } from '@colanode/core';-import { ChannelForm } from '@/renderer/components/channels/channel-form';interface ChannelCreateDialogProps {spaceId: string;diff --git a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsxindex 69077ecd..380fc43b 100644--- a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx@@ -8,8 +8,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface ChannelDeleteDialogProps {open: boolean;diff --git a/apps/desktop/src/renderer/components/channels/channel-form.tsx b/apps/desktop/src/renderer/components/channels/channel-form.tsxindex 15b81a03..01654b58 100644--- a/apps/desktop/src/renderer/components/channels/channel-form.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-form.tsx@@ -1,4 +1,10 @@+import { zodResolver } from '@hookform/resolvers/zod';+import { useForm } from 'react-hook-form';import { z } from 'zod';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Button } from '@/renderer/components/ui/button';import {Form,FormControl,@@ -6,13 +12,8 @@ import {FormItem,FormMessage,} from '@/renderer/components/ui/form';-import { Button } from '@/renderer/components/ui/button';-import { Spinner } from '@/renderer/components/ui/spinner';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';import { Input } from '@/renderer/components/ui/input';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Spinner } from '@/renderer/components/ui/spinner';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),diff --git a/apps/desktop/src/renderer/components/channels/channel-header.tsx b/apps/desktop/src/renderer/components/channels/channel-header.tsxindex 671b68e4..cdaefe1f 100644--- a/apps/desktop/src/renderer/components/channels/channel-header.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-header.tsx@@ -1,10 +1,11 @@-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { ChannelNode, Node, NodeRole } from '@colanode/core';-import { Header } from '@/renderer/components/ui/header';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';+import { ChannelSettings } from '@/renderer/components/channels/channel-settings';-import { useContainer } from '@/renderer/contexts/container';+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 { Header } from '@/renderer/components/ui/header';+import { useContainer } from '@/renderer/contexts/container';interface ChannelHeaderProps {nodes: Node[];diff --git a/apps/desktop/src/renderer/components/channels/channel-settings.tsx b/apps/desktop/src/renderer/components/channels/channel-settings.tsxindex 236c630c..5c16cbc6 100644--- a/apps/desktop/src/renderer/components/channels/channel-settings.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-settings.tsx@@ -1,4 +1,10 @@+import { ChannelNode, hasEditorAccess, NodeRole } 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 {DropdownMenu,DropdownMenuContent,@@ -7,11 +13,6 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';-import { ChannelDeleteDialog } from '@/renderer/components/channels/channel-delete-dialog';-import { ChannelNode, hasEditorAccess, NodeRole } from '@colanode/core';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';-import { ChannelUpdateDialog } from '@/renderer/components/channels/channel-update-dialog';interface ChannelSettingsProps {channel: ChannelNode;diff --git a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsxindex 1ad58456..b2bdae97 100644--- a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx@@ -1,9 +1,10 @@-import { cn } from '@/shared/lib/utils';import { ChannelNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useRadar } from '@/renderer/contexts/radar';import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { useRadar } from '@/renderer/contexts/radar';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { cn } from '@/shared/lib/utils';interface ChannelSidebarItemProps {node: ChannelNode;diff --git a/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-update-dialog.tsxindex ecc1a88a..2c3c4e9a 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,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { ChannelNode, hasEditorAccess, NodeRole } from '@colanode/core';++import { ChannelForm } from '@/renderer/components/channels/channel-form';import {Dialog,DialogContent,@@ -6,9 +8,8 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { ChannelNode, hasEditorAccess, NodeRole } from '@colanode/core';-import { ChannelForm } from '@/renderer/components/channels/channel-form';import { toast } from '@/renderer/hooks/use-toast';interface ChannelUpdateDialogProps {diff --git a/apps/desktop/src/renderer/components/chats/chat-body.tsx b/apps/desktop/src/renderer/components/chats/chat-body.tsxindex 00693e41..16eb4d37 100644--- a/apps/desktop/src/renderer/components/chats/chat-body.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-body.tsx@@ -1,4 +1,5 @@import { ChatNode, NodeRole } from '@colanode/core';+import { Conversation } from '@/renderer/components/messages/conversation';interface 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 b529b848..3a6b2436 100644--- a/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx@@ -1,7 +1,8 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { ChatNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { ChatNode } from '@colanode/core';interface ChatBreadcrumbItemProps {node: ChatNode;diff --git a/apps/desktop/src/renderer/components/chats/chat-container.tsx b/apps/desktop/src/renderer/components/chats/chat-container.tsxindex 1185e7fe..621bd19a 100644--- a/apps/desktop/src/renderer/components/chats/chat-container.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-container.tsx@@ -1,8 +1,9 @@+import { extractNodeRole } from '@colanode/core';++import { ChatBody } from '@/renderer/components/chats/chat-body';+import { ChatHeader } from '@/renderer/components/chats/chat-header';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { ChatHeader } from '@/renderer/components/chats/chat-header';-import { ChatBody } from '@/renderer/components/chats/chat-body';-import { extractNodeRole } from '@colanode/core';interface ChatContainerProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx b/apps/desktop/src/renderer/components/chats/chat-create-popover.tsxindex 209d67de..f155f2c7 100644--- a/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx@@ -1,13 +1,14 @@+import { Plus } from 'lucide-react';import React from 'react';+import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { Plus } from 'lucide-react';-import { useMutation } from '@/renderer/hooks/use-mutation';import { UserSearch } from '@/renderer/components/users/user-search';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';export const ChatCreatePopover = () => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/chats/chat-header.tsx b/apps/desktop/src/renderer/components/chats/chat-header.tsxindex 69374328..9061e212 100644--- a/apps/desktop/src/renderer/components/chats/chat-header.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-header.tsx@@ -1,9 +1,10 @@-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { ChatNode, NodeRole } from '@colanode/core';-import { Header } from '@/renderer/components/ui/header';++import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';-import { useContainer } from '@/renderer/contexts/container';import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { Header } from '@/renderer/components/ui/header';+import { useContainer } from '@/renderer/contexts/container';interface ChatHeaderProps {chat: ChatNode;diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsxindex e0c72118..67199209 100644--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx@@ -1,10 +1,11 @@-import { cn } from '@/shared/lib/utils';import { ChatNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';+import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { useRadar } from '@/renderer/contexts/radar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { useRadar } from '@/renderer/contexts/radar';-import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { cn } from '@/shared/lib/utils';interface ChatSidebarItemProps {node: ChatNode;diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsxindex 1a50309b..16e0c429 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-audit.tsx@@ -1,7 +1,8 @@+import { timeAgo } from '@colanode/core';++import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { timeAgo } from '@colanode/core';interface NodeCollaboratorAuditProps {collaboratorId: string;diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsxindex 157136aa..01090e7f 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx@@ -1,12 +1,13 @@+import { UserNode } from '@colanode/core';import React from 'react';++import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';import { NodeCollaboratorSearch } from '@/renderer/components/collaborators/node-collaborator-search';import { Button } from '@/renderer/components/ui/button';import { Spinner } from '@/renderer/components/ui/spinner';-import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { UserNode } from '@colanode/core';interface NodeCollaboratorCreate {nodeId: string;diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsxindex f55c3108..0ce56eda 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx@@ -1,10 +1,11 @@+import { Check, ChevronDown } from 'lucide-react';+import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Check, ChevronDown } from 'lucide-react';interface NodeCollaboratorRole {name: string;diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-search.tsxindex df68f280..2ecf8206 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx@@ -1,9 +1,9 @@+import { UserNode } from '@colanode/core';+import { X } from 'lucide-react';import React from 'react';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { Badge } from '@/renderer/components/ui/badge';import { Button } from '@/renderer/components/ui/button';import {Command,@@ -13,12 +13,13 @@ import {CommandItem,CommandList,} from '@/renderer/components/ui/command';-import { Badge } from '@/renderer/components/ui/badge';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { useQuery } from '@/renderer/hooks/use-query';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useWorkspace } from '@/renderer/contexts/workspace';-import { X } from 'lucide-react';-import { UserNode } from '@colanode/core';+import { useQuery } from '@/renderer/hooks/use-query';interface NodeCollaboratorSearchProps {excluded: string[];diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsxindex f941c4dd..fb9844ba 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx@@ -1,10 +1,11 @@+import { NodeRole } 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 { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';-import { Trash2 } from 'lucide-react';+import { useMutation } from '@/renderer/hooks/use-mutation';import { useQuery } from '@/renderer/hooks/use-query';-import { NodeRole } from '@colanode/core';interface NodeCollaboratorProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsxindex 498f3f34..3e570c35 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx@@ -1,11 +1,12 @@+import { Node, NodeRole } from '@colanode/core';+import { UserRoundPlus } from 'lucide-react';++import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';import {Popover,- PopoverTrigger,PopoverContent,+ PopoverTrigger,} from '@/renderer/components/ui/popover';-import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';-import { UserRoundPlus } from 'lucide-react';-import { Node, NodeRole } from '@colanode/core';interface NodeCollaboratorsPopoverProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsxindex a2879d36..f317c271 100644--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx@@ -1,13 +1,14 @@-import React from 'react';-import { Separator } from '@/renderer/components/ui/separator';-import { NodeCollaborator } from '@/renderer/components/collaborators/node-collaborator';-import { NodeCollaboratorCreate } from '@/renderer/components/collaborators/node-collaborator-create';import {extractNodeName,hasAdminAccess,Node,NodeRole,} 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 { Separator } from '@/renderer/components/ui/separator';import { buildNodeCollaborators } from '@/shared/lib/nodes';interface NodeCollaboratorsProps {diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-column-header.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-column-header.tsxindex 002f53a4..e748b486 100644--- a/apps/desktop/src/renderer/components/databases/boards/board-view-column-header.tsx+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-column-header.tsx@@ -1,6 +1,7 @@-import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';import { SelectOptionAttributes } from '@colanode/core';+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';+interface BoardViewColumnHeaderProps {option: SelectOptionAttributes;}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 3e34e513..586b990c 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@@ -4,13 +4,14 @@ import {SelectOptionAttributes,ViewFilterAttributes,} from '@colanode/core';+import { BoardViewRecordCard } from '@/renderer/components/databases/boards/board-view-record-card';-import { useView } from '@/renderer/contexts/view';-import { useRecordsQuery } from '@/renderer/hooks/user-records-query';+import { BoardViewRecordCreateCard } from '@/renderer/components/databases/boards/board-view-record-create-card';import { RecordProvider } from '@/renderer/components/records/record-provider';-import { useWorkspace } from '@/renderer/contexts/workspace';import { useDatabase } from '@/renderer/contexts/database';-import { BoardViewRecordCreateCard } from '@/renderer/components/databases/boards/board-view-record-create-card';+import { useView } from '@/renderer/contexts/view';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useRecordsQuery } from '@/renderer/hooks/user-records-query';interface BoardViewColumnRecordsProps {field: SelectFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-column.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-column.tsxindex 75766d2f..2ba33a43 100644--- a/apps/desktop/src/renderer/components/databases/boards/board-view-column.tsx+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-column.tsx@@ -1,10 +1,11 @@+import { SelectFieldAttributes, SelectOptionAttributes } from '@colanode/core';import React from 'react';-import { getSelectOptionLightColorClass } from '@/shared/lib/databases';-import { cn } from '@/shared/lib/utils';import { useDrop } from 'react-dnd';-import { SelectFieldAttributes, SelectOptionAttributes } from '@colanode/core';+import { BoardViewColumnHeader } from '@/renderer/components/databases/boards/board-view-column-header';import { BoardViewColumnRecords } from '@/renderer/components/databases/boards/board-view-column-records';+import { getSelectOptionLightColorClass } from '@/shared/lib/databases';+import { cn } from '@/shared/lib/utils';interface BoardViewColumnProps {field: SelectFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-record-card.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-record-card.tsxindex 6ff85871..6eb9cbb5 100644--- a/apps/desktop/src/renderer/components/databases/boards/board-view-record-card.tsx+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-record-card.tsx@@ -1,10 +1,11 @@-import React from 'react';-import { useWorkspace } from '@/renderer/contexts/workspace';import { SelectFieldAttributes, SelectOptionAttributes } from '@colanode/core';+import React from 'react';import { useDrag } from 'react-dnd';-import { useView } from '@/renderer/contexts/view';+import { RecordFieldValue } from '@/renderer/components/records/record-field-value';import { useRecord } from '@/renderer/contexts/record';+import { useView } from '@/renderer/contexts/view';+import { useWorkspace } from '@/renderer/contexts/workspace';interface DragResult {option: SelectOptionAttributes;diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-record-create-card.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-record-create-card.tsxindex d9bab615..3315a758 100644--- a/apps/desktop/src/renderer/components/databases/boards/board-view-record-create-card.tsx+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-record-create-card.tsx@@ -1,7 +1,8 @@-import { useDatabase } from '@/renderer/contexts/database';+import { ViewFilterAttributes } from '@colanode/core';import { Plus } from 'lucide-react';++import { useDatabase } from '@/renderer/contexts/database';import { useView } from '@/renderer/contexts/view';-import { ViewFilterAttributes } from '@colanode/core';interface BoardViewRecordCreateCardProps {filters: ViewFilterAttributes[];diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-settings.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-settings.tsxindex a2a22030..f9fb3955 100644--- a/apps/desktop/src/renderer/components/databases/boards/board-view-settings.tsx+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-settings.tsx@@ -1,27 +1,28 @@+import { Eye, EyeOff, Trash2 } from 'lucide-react';import React from 'react';++import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';+import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { ViewDeleteDialog } from '@/renderer/components/databases/view-delete-dialog';+import { ViewIcon } from '@/renderer/components/databases/view-icon';+import { ViewSettingsButton } from '@/renderer/components/databases/view-settings-button';+import { Button } from '@/renderer/components/ui/button';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { useView } from '@/renderer/contexts/view';import { Separator } from '@/renderer/components/ui/separator';-import { useDatabase } from '@/renderer/contexts/database';-import { cn } from '@/shared/lib/utils';+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import {Tooltip,TooltipContent,TooltipTrigger,} from '@/renderer/components/ui/tooltip';-import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';-import { ViewDeleteDialog } from '@/renderer/components/databases/view-delete-dialog';-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';-import { Button } from '@/renderer/components/ui/button';-import { Eye, EyeOff, Trash2 } from 'lucide-react';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ViewIcon } from '@/renderer/components/databases/view-icon';-import { ViewSettingsButton } from '@/renderer/components/databases/view-settings-button';+import { useDatabase } from '@/renderer/contexts/database';+import { useView } from '@/renderer/contexts/view';+import { cn } from '@/shared/lib/utils';export const BoardViewSettings = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view.tsxindex 0f456e12..efb390b5 100644--- a/apps/desktop/src/renderer/components/databases/boards/board-view.tsx+++ b/apps/desktop/src/renderer/components/databases/boards/board-view.tsx@@ -1,12 +1,13 @@import React from 'react';-import { ViewTabs } from '@/renderer/components/databases/view-tabs';-import { useDatabase } from '@/renderer/contexts/database';+import { BoardViewColumn } from '@/renderer/components/databases/boards/board-view-column';+import { BoardViewSettings } from '@/renderer/components/databases/boards/board-view-settings';+import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';import { ViewSearchBar } from '@/renderer/components/databases/search/view-search-bar';import { ViewSortButton } from '@/renderer/components/databases/search/view-sort-button';-import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';+import { ViewTabs } from '@/renderer/components/databases/view-tabs';+import { useDatabase } from '@/renderer/contexts/database';import { useView } from '@/renderer/contexts/view';-import { BoardViewSettings } from '@/renderer/components/databases/boards/board-view-settings';export const BoardView = () => {const database = useDatabase();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 bc939ca9..2b6c11a2 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,10 +1,11 @@-import { cn } from '@/shared/lib/utils';-import { extractNodeRole, RecordNode, isSameDay } from '@colanode/core';-import { CalendarViewRecordCard } from '@/renderer/components/databases/calendars/calendar-view-record-card';+import { extractNodeRole, isSameDay,RecordNode } from '@colanode/core';import { Plus } from 'lucide-react';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useDatabase } from '@/renderer/contexts/database';++import { CalendarViewRecordCard } from '@/renderer/components/databases/calendars/calendar-view-record-card';import { RecordProvider } from '@/renderer/components/records/record-provider';+import { useDatabase } from '@/renderer/contexts/database';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { cn } from '@/shared/lib/utils';interface CalendarViewDayProps {date: Date;diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsxindex 6d9e75c0..0d18edb7 100644--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx@@ -1,20 +1,21 @@-import React from 'react';-import { buttonVariants } from '@/renderer/components/ui/button';-import { cn, getDisplayedDates } from '@/shared/lib/utils';-import { DayPicker, DayProps } from 'react-day-picker';-import { CalendarViewDay } from '@/renderer/components/databases/calendars/calendar-view-day';import {FieldAttributes,- ViewFilterAttributes,isSameDay,toUTCDate,+ ViewFilterAttributes,} from '@colanode/core';-import { useRecordsQuery } from '@/renderer/hooks/user-records-query';-import { filterRecords } from '@/shared/lib/databases';-import { useWorkspace } from '@/renderer/contexts/workspace';import { ChevronLeft, ChevronRight } from 'lucide-react';-import { useView } from '@/renderer/contexts/view';+import React from 'react';+import { DayPicker, DayProps } from 'react-day-picker';++import { CalendarViewDay } from '@/renderer/components/databases/calendars/calendar-view-day';+import { buttonVariants } from '@/renderer/components/ui/button';import { useDatabase } from '@/renderer/contexts/database';+import { useView } from '@/renderer/contexts/view';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useRecordsQuery } from '@/renderer/hooks/user-records-query';+import { filterRecords } from '@/shared/lib/databases';+import { cn, getDisplayedDates } from '@/shared/lib/utils';interface CalendarViewGridProps {field: FieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record-card.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record-card.tsxindex bdfd1aa4..e5409700 100644--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record-card.tsx+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-record-card.tsx@@ -1,7 +1,7 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { RecordFieldValue } from '@/renderer/components/records/record-field-value';import { useRecord } from '@/renderer/contexts/record';import { useView } from '@/renderer/contexts/view';-import { RecordFieldValue } from '@/renderer/components/records/record-field-value';+import { useWorkspace } from '@/renderer/contexts/workspace';export const CalendarViewRecordCard = () => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-settings.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-settings.tsxindex dd9805dc..909870a4 100644--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-settings.tsx+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-settings.tsx@@ -1,27 +1,28 @@+import { Eye, EyeOff, Trash2 } from 'lucide-react';import React from 'react';++import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';+import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { ViewDeleteDialog } from '@/renderer/components/databases/view-delete-dialog';+import { ViewIcon } from '@/renderer/components/databases/view-icon';+import { ViewSettingsButton } from '@/renderer/components/databases/view-settings-button';+import { Button } from '@/renderer/components/ui/button';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { useView } from '@/renderer/contexts/view';import { Separator } from '@/renderer/components/ui/separator';-import { useDatabase } from '@/renderer/contexts/database';-import { cn } from '@/shared/lib/utils';+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import {Tooltip,TooltipContent,TooltipTrigger,} from '@/renderer/components/ui/tooltip';-import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';-import { ViewDeleteDialog } from '@/renderer/components/databases/view-delete-dialog';-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';-import { Button } from '@/renderer/components/ui/button';-import { Eye, EyeOff, Trash2 } from 'lucide-react';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ViewIcon } from '@/renderer/components/databases/view-icon';-import { ViewSettingsButton } from '@/renderer/components/databases/view-settings-button';+import { useDatabase } from '@/renderer/contexts/database';+import { useView } from '@/renderer/contexts/view';+import { cn } from '@/shared/lib/utils';export const CalendarViewSettings = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsxindex 74cdc276..38d1392e 100644--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsx+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsx@@ -1,12 +1,13 @@import React from 'react';-import { ViewTabs } from '@/renderer/components/databases/view-tabs';-import { useDatabase } from '@/renderer/contexts/database';+import { CalendarViewGrid } from '@/renderer/components/databases/calendars/calendar-view-grid';+import { CalendarViewSettings } from '@/renderer/components/databases/calendars/calendar-view-settings';+import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';import { ViewSearchBar } from '@/renderer/components/databases/search/view-search-bar';import { ViewSortButton } from '@/renderer/components/databases/search/view-sort-button';-import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';+import { ViewTabs } from '@/renderer/components/databases/view-tabs';+import { useDatabase } from '@/renderer/contexts/database';import { useView } from '@/renderer/contexts/view';-import { CalendarViewSettings } from '@/renderer/components/databases/calendars/calendar-view-settings';export const CalendarView = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/database-body.tsx b/apps/desktop/src/renderer/components/databases/database-body.tsxindex 9b3bd736..8f2fb03e 100644--- a/apps/desktop/src/renderer/components/databases/database-body.tsx+++ b/apps/desktop/src/renderer/components/databases/database-body.tsx@@ -1,6 +1,7 @@import { DatabaseNode, NodeRole } from '@colanode/core';-import { DatabaseViews } from '@/renderer/components/databases/database-views';+import { Database } from '@/renderer/components/databases/database';+import { DatabaseViews } from '@/renderer/components/databases/database-views';interface DatabaseBodyProps {database: DatabaseNode;diff --git a/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsxindex 393d1ee6..eca9e365 100644--- a/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx@@ -1,4 +1,5 @@import { DatabaseNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';interface DatabaseBreadcrumbItemProps {diff --git a/apps/desktop/src/renderer/components/databases/database-container.tsx b/apps/desktop/src/renderer/components/databases/database-container.tsxindex b8b046f2..17b63511 100644--- a/apps/desktop/src/renderer/components/databases/database-container.tsx+++ b/apps/desktop/src/renderer/components/databases/database-container.tsx@@ -1,8 +1,9 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';-import { DatabaseHeader } from '@/renderer/components/databases/database-header';import { extractNodeRole } from '@colanode/core';+import { DatabaseBody } from '@/renderer/components/databases/database-body';+import { DatabaseHeader } from '@/renderer/components/databases/database-header';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface DatabaseContainerProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-create-dialog.tsxindex a92a8cfe..3e6bf6c2 100644--- a/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx@@ -1,4 +1,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { generateId,IdType } from '@colanode/core';++import { DatabaseForm } from '@/renderer/components/databases/database-form';import {Dialog,DialogContent,@@ -6,9 +8,8 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { IdType, generateId } from '@colanode/core';-import { DatabaseForm } from '@/renderer/components/databases/database-form';interface DatabaseCreateDialogProps {spaceId: string;diff --git a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsxindex 69fea26d..96eb1080 100644--- a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx@@ -8,8 +8,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface DatabaseDeleteDialogProps {open: boolean;diff --git a/apps/desktop/src/renderer/components/databases/database-form.tsx b/apps/desktop/src/renderer/components/databases/database-form.tsxindex 30adfbe5..c7f4baee 100644--- a/apps/desktop/src/renderer/components/databases/database-form.tsx+++ b/apps/desktop/src/renderer/components/databases/database-form.tsx@@ -1,4 +1,10 @@+import { zodResolver } from '@hookform/resolvers/zod';+import { useForm } from 'react-hook-form';import { z } from 'zod';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Button } from '@/renderer/components/ui/button';import {Form,FormControl,@@ -6,13 +12,8 @@ import {FormItem,FormMessage,} from '@/renderer/components/ui/form';-import { Button } from '@/renderer/components/ui/button';-import { Spinner } from '@/renderer/components/ui/spinner';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';import { Input } from '@/renderer/components/ui/input';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Spinner } from '@/renderer/components/ui/spinner';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),diff --git a/apps/desktop/src/renderer/components/databases/database-header.tsx b/apps/desktop/src/renderer/components/databases/database-header.tsxindex 8e06129c..15adc5d8 100644--- a/apps/desktop/src/renderer/components/databases/database-header.tsx+++ b/apps/desktop/src/renderer/components/databases/database-header.tsx@@ -1,10 +1,11 @@-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { DatabaseNode, Node, NodeRole } from '@colanode/core';-import { Header } from '@/renderer/components/ui/header';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';++import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { DatabaseSettings } from '@/renderer/components/databases/database-settings';-import { useContainer } from '@/renderer/contexts/container';+import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { Header } from '@/renderer/components/ui/header';+import { useContainer } from '@/renderer/contexts/container';interface DatabaseHeaderProps {nodes: Node[];diff --git a/apps/desktop/src/renderer/components/databases/database-settings.tsx b/apps/desktop/src/renderer/components/databases/database-settings.tsxindex 7359d4cc..14028792 100644--- a/apps/desktop/src/renderer/components/databases/database-settings.tsx+++ b/apps/desktop/src/renderer/components/databases/database-settings.tsx@@ -1,4 +1,10 @@+import { DatabaseNode, hasEditorAccess, NodeRole } 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 { DatabaseDeleteDialog } from '@/renderer/components/databases/database-delete-dialog';+import { DatabaseUpdateDialog } from '@/renderer/components/databases/database-update-dialog';import {DropdownMenu,DropdownMenuContent,@@ -7,11 +13,6 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';-import { DatabaseDeleteDialog } from '@/renderer/components/databases/database-delete-dialog';-import { DatabaseNode, hasEditorAccess, NodeRole } from '@colanode/core';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';-import { DatabaseUpdateDialog } from '@/renderer/components/databases/database-update-dialog';interface DatabaseSettingsProps {database: DatabaseNode;diff --git a/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx b/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsxindex 905c644a..a6f6a114 100644--- a/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx+++ b/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx@@ -1,7 +1,8 @@-import { cn } from '@/shared/lib/utils';import { DatabaseNode } 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;diff --git a/apps/desktop/src/renderer/components/databases/database-update-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-update-dialog.tsxindex cb697147..7c49901a 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,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { DatabaseNode, hasEditorAccess, NodeRole } from '@colanode/core';++import { DatabaseForm } from '@/renderer/components/databases/database-form';import {Dialog,DialogContent,@@ -6,10 +8,9 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { DatabaseNode, hasEditorAccess, NodeRole } from '@colanode/core';import { toast } from '@/renderer/hooks/use-toast';-import { DatabaseForm } from './database-form';interface DatabaseUpdateDialogProps {database: DatabaseNode;diff --git a/apps/desktop/src/renderer/components/databases/database-views.tsx b/apps/desktop/src/renderer/components/databases/database-views.tsxindex 33168def..1f519f5d 100644--- a/apps/desktop/src/renderer/components/databases/database-views.tsx+++ b/apps/desktop/src/renderer/components/databases/database-views.tsx@@ -1,8 +1,9 @@import React from 'react';-import { DatabaseViewsContext } from '@/renderer/contexts/database-views';+import { View } from '@/renderer/components/databases/view';import { ScrollArea } from '@/renderer/components/ui/scroll-area';import { useDatabase } from '@/renderer/contexts/database';+import { DatabaseViewsContext } from '@/renderer/contexts/database-views';export const DatabaseViews = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/database.tsx b/apps/desktop/src/renderer/components/databases/database.tsxindex cb5ebd53..b6d06a10 100644--- a/apps/desktop/src/renderer/components/databases/database.tsx+++ b/apps/desktop/src/renderer/components/databases/database.tsx@@ -1,13 +1,14 @@-import React from 'react';-import { DatabaseContext } from '@/renderer/contexts/database';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useMutation } from '@/renderer/hooks/use-mutation';import {DatabaseNode,hasCollaboratorAccess,hasEditorAccess,NodeRole,} from '@colanode/core';+import React from 'react';++import { DatabaseContext } from '@/renderer/contexts/database';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface DatabaseProps {database: DatabaseNode;diff --git a/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsx b/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsxindex 210460dd..e2e577a0 100644--- a/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/field-create-popover.tsx@@ -1,8 +1,11 @@-import React from 'react';import { zodResolver } from '@hookform/resolvers/zod';+import { Plus } from 'lucide-react';+import React from 'react';import { useForm } from 'react-hook-form';import * as z from 'zod';+import { FieldAttrs } from '@/renderer/components/databases/fields/field-attrs';+import { FieldTypeSelect } from '@/renderer/components/databases/fields/field-type-select';import { Button } from '@/renderer/components/ui/button';import {Form,@@ -18,13 +21,10 @@ import {PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { useDatabase } from '@/renderer/contexts/database';-import { FieldTypeSelect } from '@/renderer/components/databases/fields/field-type-select';-import { FieldAttrs } from '@/renderer/components/databases/fields/field-attrs';import { Spinner } from '@/renderer/components/ui/spinner';-import { useMutation } from '@/renderer/hooks/use-mutation';+import { useDatabase } from '@/renderer/contexts/database';import { useWorkspace } from '@/renderer/contexts/workspace';-import { Plus } from 'lucide-react';+import { useMutation } from '@/renderer/hooks/use-mutation';const formSchema = z.object({name: z.string(),diff --git a/apps/desktop/src/renderer/components/databases/fields/field-icon.tsx b/apps/desktop/src/renderer/components/databases/fields/field-icon.tsxindex d8824c49..d2f30285 100644--- a/apps/desktop/src/renderer/components/databases/fields/field-icon.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/field-icon.tsx@@ -1,17 +1,17 @@import { FieldType } from '@colanode/core';import {- SquareCheck,- User,Calendar,- Mail,File,- ListChecks,Hash,- Smartphone,- ListCheck,- Text,Link,+ ListCheck,+ ListChecks,+ Mail,ShieldQuestion,+ Smartphone,+ SquareCheck,+ Text,+ User,} from 'lucide-react';interface FieldIconProps {diff --git a/apps/desktop/src/renderer/components/databases/fields/field-rename-input.tsx b/apps/desktop/src/renderer/components/databases/fields/field-rename-input.tsxindex 0211488a..4e9606ea 100644--- a/apps/desktop/src/renderer/components/databases/fields/field-rename-input.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/field-rename-input.tsx@@ -1,4 +1,5 @@import { FieldAttributes } from '@colanode/core';+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useDatabase } from '@/renderer/contexts/database';diff --git a/apps/desktop/src/renderer/components/databases/fields/field-select.tsx b/apps/desktop/src/renderer/components/databases/fields/field-select.tsxindex d66f1170..25d4a3e0 100644--- a/apps/desktop/src/renderer/components/databases/fields/field-select.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/field-select.tsx@@ -1,9 +1,8 @@+import { FieldAttributes, FieldType } from '@colanode/core';+import { Check, ChevronDown } from 'lucide-react';import React from 'react';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';import { Button } from '@/renderer/components/ui/button';import {Command,@@ -13,10 +12,12 @@ import {CommandItem,CommandList,} from '@/renderer/components/ui/command';-import { FieldType, FieldAttributes } from '@colanode/core';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { cn } from '@/shared/lib/utils';-import { FieldIcon } from './field-icon';-import { Check, ChevronDown } from 'lucide-react';interface FieldSelectProps {fields: FieldAttributes[];diff --git a/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsx b/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsxindex b1a059b9..a0408fe3 100644--- a/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/field-type-select.tsx@@ -1,9 +1,8 @@+import { FieldType } from '@colanode/core';+import { Check, ChevronsUpDown } from 'lucide-react';import React from 'react';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';import { Button } from '@/renderer/components/ui/button';import {Command,@@ -13,10 +12,12 @@ import {CommandItem,CommandList,} from '@/renderer/components/ui/command';-import { FieldType } from '@colanode/core';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { cn } from '@/shared/lib/utils';-import { FieldIcon } from './field-icon';-import { Check, ChevronsUpDown } from 'lucide-react';interface FieldTypeOption {name: string;diff --git a/apps/desktop/src/renderer/components/databases/fields/select-field-options.tsx b/apps/desktop/src/renderer/components/databases/fields/select-field-options.tsxindex 5134a319..3284b734 100644--- a/apps/desktop/src/renderer/components/databases/fields/select-field-options.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/select-field-options.tsx@@ -1,4 +1,12 @@+import {+ MultiSelectFieldAttributes,+ SelectFieldAttributes,+} from '@colanode/core';+import { Check, Plus, X } from 'lucide-react';import React from 'react';++import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';+import { SelectOptionSettingsPopover } from '@/renderer/components/databases/fields/select-option-settings-popover';import {Command,CommandEmpty,@@ -7,17 +15,10 @@ import {CommandItem,CommandList,} from '@/renderer/components/ui/command';-import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';-import {- MultiSelectFieldAttributes,- SelectFieldAttributes,-} from '@colanode/core';-import { getRandomSelectOptionColor } from '@/shared/lib/databases';-import { SelectOptionSettingsPopover } from '@/renderer/components/databases/fields/select-option-settings-popover';+import { useDatabase } from '@/renderer/contexts/database';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { Check, Plus, X } from 'lucide-react';-import { useDatabase } from '@/renderer/contexts/database';+import { getRandomSelectOptionColor } from '@/shared/lib/databases';interface SelectFieldOptionsProps {field: SelectFieldAttributes | MultiSelectFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/fields/select-option-badge.tsx b/apps/desktop/src/renderer/components/databases/fields/select-option-badge.tsxindex 002bb302..3b89b4dd 100644--- a/apps/desktop/src/renderer/components/databases/fields/select-option-badge.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/select-option-badge.tsx@@ -1,5 +1,5 @@-import { cn } from '@/shared/lib/utils';import { getSelectOptionColorClass } from '@/shared/lib/databases';+import { cn } from '@/shared/lib/utils';interface SelectOptionBadgeProps {name: string;diff --git a/apps/desktop/src/renderer/components/databases/fields/select-option-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/fields/select-option-delete-dialog.tsxindex e60d14f1..f7997341 100644--- a/apps/desktop/src/renderer/components/databases/fields/select-option-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/select-option-delete-dialog.tsx@@ -8,8 +8,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface SelectOptionDeleteDialogProps {id: string;diff --git a/apps/desktop/src/renderer/components/databases/fields/select-option-settings-popover.tsx b/apps/desktop/src/renderer/components/databases/fields/select-option-settings-popover.tsxindex 44599e66..1a06536b 100644--- a/apps/desktop/src/renderer/components/databases/fields/select-option-settings-popover.tsx+++ b/apps/desktop/src/renderer/components/databases/fields/select-option-settings-popover.tsx@@ -1,4 +1,8 @@+import { SelectOptionAttributes } from '@colanode/core';+import { Ellipsis, Trash2 } from 'lucide-react';import React from 'react';++import { SelectOptionDeleteDialog } from '@/renderer/components/databases/fields/select-option-delete-dialog';import { Label } from '@/renderer/components/ui/label';import {Popover,@@ -6,13 +10,10 @@ import {PopoverTrigger,} from '@/renderer/components/ui/popover';import { Separator } from '@/renderer/components/ui/separator';-import { selectOptionColors } from '@/shared/lib/databases';-import { cn } from '@/shared/lib/utils';-import { SelectOptionAttributes } from '@colanode/core';-import { SelectOptionDeleteDialog } from '@/renderer/components/databases/fields/select-option-delete-dialog';import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { Ellipsis, Trash2 } from 'lucide-react';import { useDatabase } from '@/renderer/contexts/database';+import { selectOptionColors } from '@/shared/lib/databases';+import { cn } from '@/shared/lib/utils';interface SelectOptionSettingsPopoverProps {fieldId: string;diff --git a/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsxindex 69462faa..978a89c0 100644--- a/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx@@ -2,22 +2,23 @@ import {BooleanFieldAttributes,ViewFieldFilterAttributes,} from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { booleanFieldFilterOperators } from '@/shared/lib/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '../fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { booleanFieldFilterOperators } from '@/shared/lib/databases';interface ViewBooleanFieldFilterProps {field: BooleanFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx b/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsxindex 194d074d..490c0a43 100644--- a/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx@@ -2,23 +2,24 @@ import {CreatedAtFieldAttributes,ViewFieldFilterAttributes,} from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';+import { DatePicker } from '@/renderer/components/ui/date-picker';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { dateFieldFilterOperators } from '@/shared/lib/databases';-import { DatePicker } from '@/renderer/components/ui/date-picker';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '../fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { dateFieldFilterOperators } from '@/shared/lib/databases';interface ViewCreatedAtFieldFilterProps {field: CreatedAtFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsxindex de041b32..e24c4e13 100644--- a/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx@@ -1,21 +1,22 @@import { DateFieldAttributes, ViewFieldFilterAttributes } from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';+import { DatePicker } from '@/renderer/components/ui/date-picker';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { dateFieldFilterOperators } from '@/shared/lib/databases';-import { DatePicker } from '@/renderer/components/ui/date-picker';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { dateFieldFilterOperators } from '@/shared/lib/databases';interface ViewDateFieldFilterProps {field: DateFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsxindex 1273a9dc..c31ec8d6 100644--- a/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx@@ -2,23 +2,24 @@ import {EmailFieldAttributes,ViewFieldFilterAttributes,} from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { emailFieldFilterOperators } from '@/shared/lib/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { emailFieldFilterOperators } from '@/shared/lib/databases';interface ViewEmailFieldFilterProps {field: EmailFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-filter-add-popover.tsx b/apps/desktop/src/renderer/components/databases/search/view-filter-add-popover.tsxindex 851558da..9c521d32 100644--- a/apps/desktop/src/renderer/components/databases/search/view-filter-add-popover.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-filter-add-popover.tsx@@ -1,9 +1,6 @@import React from 'react';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';import {Command,CommandEmpty,@@ -12,9 +9,13 @@ import {CommandItem,CommandList,} from '@/renderer/components/ui/command';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useDatabase } from '@/renderer/contexts/database';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';interface ViewFilterAddPopoverProps {children: React.ReactNode;diff --git a/apps/desktop/src/renderer/components/databases/search/view-filter-button.tsx b/apps/desktop/src/renderer/components/databases/search/view-filter-button.tsxindex d091e6b8..eb5aac11 100644--- a/apps/desktop/src/renderer/components/databases/search/view-filter-button.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-filter-button.tsx@@ -1,6 +1,7 @@+import { Filter } from 'lucide-react';+import { ViewFilterAddPopover } from '@/renderer/components/databases/search/view-filter-add-popover';import { useView } from '@/renderer/contexts/view';-import { Filter } from 'lucide-react';export const ViewFilterButton = () => {const view = useView();diff --git a/apps/desktop/src/renderer/components/databases/search/view-filters.tsx b/apps/desktop/src/renderer/components/databases/search/view-filters.tsxindex 75e66749..0930f953 100644--- a/apps/desktop/src/renderer/components/databases/search/view-filters.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-filters.tsx@@ -1,17 +1,18 @@-import { useDatabase } from '@/renderer/contexts/database';-import { ViewTextFieldFilter } from '@/renderer/components/databases/search/view-text-field-filter';-import { ViewNumberFieldFilter } from '@/renderer/components/databases/search/view-number-field-filter';-import { ViewEmailFieldFilter } from '@/renderer/components/databases/search/view-email-field-filter';-import { ViewUrlFieldFilter } from '@/renderer/components/databases/search/view-url-field-filter';-import { ViewPhoneFieldFilter } from '@/renderer/components/databases/search/view-phone-field-filter';+import { Plus } from 'lucide-react';+import { ViewBooleanFieldFilter } from '@/renderer/components/databases/search/view-boolean-field-filter';-import { ViewSelectFieldFilter } from '@/renderer/components/databases/search/view-select-field-filter';-import { ViewMultiSelectFieldFilter } from '@/renderer/components/databases/search/view-multi-select-field-filter';-import { ViewDateFieldFilter } from '@/renderer/components/databases/search/view-date-field-filter';import { ViewCreatedAtFieldFilter } from '@/renderer/components/databases/search/view-created-at-field-fitler';+import { ViewDateFieldFilter } from '@/renderer/components/databases/search/view-date-field-filter';+import { ViewEmailFieldFilter } from '@/renderer/components/databases/search/view-email-field-filter';import { ViewFilterAddPopover } from '@/renderer/components/databases/search/view-filter-add-popover';+import { ViewMultiSelectFieldFilter } from '@/renderer/components/databases/search/view-multi-select-field-filter';+import { ViewNumberFieldFilter } from '@/renderer/components/databases/search/view-number-field-filter';+import { ViewPhoneFieldFilter } from '@/renderer/components/databases/search/view-phone-field-filter';+import { ViewSelectFieldFilter } from '@/renderer/components/databases/search/view-select-field-filter';+import { ViewTextFieldFilter } from '@/renderer/components/databases/search/view-text-field-filter';+import { ViewUrlFieldFilter } from '@/renderer/components/databases/search/view-url-field-filter';+import { useDatabase } from '@/renderer/contexts/database';import { useView } from '@/renderer/contexts/view';-import { Plus } from 'lucide-react';export const ViewFilters = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsxindex 3acc4067..32f1892c 100644--- a/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx@@ -2,24 +2,25 @@ import {MultiSelectFieldAttributes,ViewFieldFilterAttributes,} from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { selectFieldFilterOperators } from '@/shared/lib/databases';-import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';-import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { selectFieldFilterOperators } from '@/shared/lib/databases';interface ViewMultiSelectFieldFilterProps {field: MultiSelectFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsxindex e138da6e..97123ea8 100644--- a/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx@@ -2,23 +2,24 @@ import {NumberFieldAttributes,ViewFieldFilterAttributes,} from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { SmartNumberInput } from '@/renderer/components/ui/smart-number-input';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';import { numberFieldFilterOperators } from '@/shared/lib/databases';-import { ChevronDown, Trash2 } from 'lucide-react';interface ViewNumberFieldFilterProps {field: NumberFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsxindex 3e09fb89..9f13cedf 100644--- a/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx@@ -2,23 +2,24 @@ import {PhoneFieldAttributes,ViewFieldFilterAttributes,} from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { phoneFieldFilterOperators } from '@/shared/lib/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { phoneFieldFilterOperators } from '@/shared/lib/databases';interface ViewPhoneFieldFilterProps {field: PhoneFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-search-bar.tsx b/apps/desktop/src/renderer/components/databases/search/view-search-bar.tsxindex fe4ad7ac..a2f8f11f 100644--- a/apps/desktop/src/renderer/components/databases/search/view-search-bar.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-search-bar.tsx@@ -1,6 +1,7 @@import React from 'react';-import { ViewSorts } from '@/renderer/components/databases/search/view-sorts';+import { ViewFilters } from '@/renderer/components/databases/search/view-filters';+import { ViewSorts } from '@/renderer/components/databases/search/view-sorts';import { Separator } from '@/renderer/components/ui/separator';import { useView } from '@/renderer/contexts/view';diff --git a/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsxindex fdc49bf9..fea0746a 100644--- a/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx@@ -2,24 +2,25 @@ import {SelectFieldAttributes,ViewFieldFilterAttributes,} from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { selectFieldFilterOperators } from '@/shared/lib/databases';-import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';-import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '../fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { selectFieldFilterOperators } from '@/shared/lib/databases';interface ViewSelectFieldFilterProps {field: SelectFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-sort-add-popover.tsx b/apps/desktop/src/renderer/components/databases/search/view-sort-add-popover.tsxindex 81c474e6..f92396c3 100644--- a/apps/desktop/src/renderer/components/databases/search/view-sort-add-popover.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-sort-add-popover.tsx@@ -1,9 +1,6 @@import React from 'react';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';import {Command,CommandEmpty,@@ -12,10 +9,14 @@ import {CommandItem,CommandList,} from '@/renderer/components/ui/command';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { useDatabase } from '@/renderer/contexts/database';-import { isSortableField } from '@/shared/lib/databases';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { isSortableField } from '@/shared/lib/databases';interface ViewSortAddPopoverProps {children: React.ReactNode;diff --git a/apps/desktop/src/renderer/components/databases/search/view-sort-button.tsx b/apps/desktop/src/renderer/components/databases/search/view-sort-button.tsxindex e4d13bf4..f5d5050b 100644--- a/apps/desktop/src/renderer/components/databases/search/view-sort-button.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-sort-button.tsx@@ -1,6 +1,7 @@+import { ArrowDownAz } from 'lucide-react';+import { ViewSortAddPopover } from '@/renderer/components/databases/search/view-sort-add-popover';import { useView } from '@/renderer/contexts/view';-import { ArrowDownAz } from 'lucide-react';export const ViewSortButton = () => {const view = useView();diff --git a/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsx b/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsxindex 5058379a..a6bc0ca0 100644--- a/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-sort-row.tsx@@ -1,14 +1,15 @@import { FieldAttributes, ViewSortAttributes } from '@colanode/core';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';interface ViewSortProps {sort: ViewSortAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-sorts.tsx b/apps/desktop/src/renderer/components/databases/search/view-sorts.tsxindex f72623f5..2df01ebd 100644--- a/apps/desktop/src/renderer/components/databases/search/view-sorts.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-sorts.tsx@@ -1,14 +1,15 @@+import { Plus } from 'lucide-react';++import { ViewSortAddPopover } from '@/renderer/components/databases/search/view-sort-add-popover';+import { ViewSortRow } from '@/renderer/components/databases/search/view-sort-row';+import { Button } from '@/renderer/components/ui/button';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { Button } from '@/renderer/components/ui/button';-import { ViewSortRow } from '@/renderer/components/databases/search/view-sort-row';import { useDatabase } from '@/renderer/contexts/database';-import { ViewSortAddPopover } from '@/renderer/components/databases/search/view-sort-add-popover';import { useView } from '@/renderer/contexts/view';-import { Plus } from 'lucide-react';export const ViewSorts = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsxindex fadff651..3eb27a5b 100644--- a/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx@@ -1,21 +1,22 @@import { TextFieldAttributes, ViewFieldFilterAttributes } from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown,Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { textFieldFilterOperators } from '@/shared/lib/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { Trash2, ChevronDown } from 'lucide-react';+import { textFieldFilterOperators } from '@/shared/lib/databases';interface ViewTextFieldFilterProps {field: TextFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsxindex 0e38f457..09ca82ff 100644--- a/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx+++ b/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx@@ -1,21 +1,22 @@import { UrlFieldAttributes, ViewFieldFilterAttributes } from '@colanode/core';-import {- Popover,- PopoverContent,- PopoverTrigger,-} from '@/renderer/components/ui/popover';+import { ChevronDown, Trash2 } from 'lucide-react';++import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Button } from '@/renderer/components/ui/button';-import { urlFieldFilterOperators } from '@/shared/lib/databases';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/renderer/components/ui/popover';import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ChevronDown, Trash2 } from 'lucide-react';+import { urlFieldFilterOperators } from '@/shared/lib/databases';interface ViewUrlFieldFilterProps {field: UrlFieldAttributes;diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsxindex 0d01e131..7f72b1da 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-body.tsx@@ -1,8 +1,8 @@-import { TableViewRow } from '@/renderer/components/databases/tables/table-view-row';import { TableViewEmptyPlaceholder } from '@/renderer/components/databases/tables/table-view-empty-placeholder';import { TableViewLoadMoreRow } from '@/renderer/components/databases/tables/table-view-load-more-row';-import { useRecordsQuery } from '@/renderer/hooks/user-records-query';+import { TableViewRow } from '@/renderer/components/databases/tables/table-view-row';import { useView } from '@/renderer/contexts/view';+import { useRecordsQuery } from '@/renderer/hooks/user-records-query';export const TableViewBody = () => {const view = useView();diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-field-header.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-field-header.tsxindex 00d9de21..8eecbec2 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-field-header.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-field-header.tsx@@ -1,21 +1,22 @@+import { ArrowDownAz, ArrowDownZa, EyeOff, Filter, Trash2 } from 'lucide-react';+import { Resizable } from 're-resizable';import React from 'react';-import { cn } from '@/shared/lib/utils';import { useDrag, useDrop } from 'react-dnd';-import { Resizable } from 're-resizable';++import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';+import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { FieldRenameInput } from '@/renderer/components/databases/fields/field-rename-input';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';import { Separator } from '@/renderer/components/ui/separator';-import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';-import { FieldRenameInput } from '@/renderer/components/databases/fields/field-rename-input';-import { useView } from '@/renderer/contexts/view';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ArrowDownAz, ArrowDownZa, EyeOff, Filter, Trash2 } from 'lucide-react';-import { ViewField } from '@/shared/types/databases';import { useDatabase } from '@/renderer/contexts/database';+import { useView } from '@/renderer/contexts/view';import { isFilterableField, isSortableField } from '@/shared/lib/databases';+import { cn } from '@/shared/lib/utils';+import { ViewField } from '@/shared/types/databases';interface TableViewFieldHeaderProps {viewField: ViewField;diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-header.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-header.tsxindex 3d33a25c..c81984a2 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-header.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-header.tsx@@ -1,8 +1,8 @@-import { useView } from '@/renderer/contexts/view';-import { TableViewNameHeader } from '@/renderer/components/databases/tables/table-view-name-header';-import { TableViewFieldHeader } from '@/renderer/components/databases/tables/table-view-field-header';import { FieldCreatePopover } from '@/renderer/components/databases/fields/field-create-popover';+import { TableViewFieldHeader } from '@/renderer/components/databases/tables/table-view-field-header';+import { TableViewNameHeader } from '@/renderer/components/databases/tables/table-view-name-header';import { useDatabase } from '@/renderer/contexts/database';+import { useView } from '@/renderer/contexts/view';export const TableViewHeader = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-load-more-row.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-load-more-row.tsxindex d42af77b..6de91ae4 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-load-more-row.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-load-more-row.tsx@@ -1,6 +1,7 @@-import { Spinner } from '@/renderer/components/ui/spinner';import { ArrowDown } from 'lucide-react';+import { Spinner } from '@/renderer/components/ui/spinner';+interface TableViewLoadMoreRowProps {isPending: boolean;onClick: () => void;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 fa26cb66..b8c75408 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,10 +1,11 @@-import React from 'react';+import { RecordNode } from '@colanode/core';import isHotkey from 'is-hotkey';-import { useWorkspace } from '@/renderer/contexts/workspace';+import { Maximize2 } from 'lucide-react';+import React from 'react';+import { Spinner } from '@/renderer/components/ui/spinner';-import { RecordNode } from '@colanode/core';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { Maximize2 } from 'lucide-react';interface NameEditorProps {initialValue: string;diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-name-header.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-name-header.tsxindex c1011b53..5c70919a 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-name-header.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-name-header.tsx@@ -1,17 +1,18 @@-import React from 'react';+import { ArrowDownAz, ArrowDownZa, Filter, Type } from 'lucide-react';import { Resizable } from 're-resizable';+import React from 'react';+import { useDrop } from 'react-dnd';++import { Input } from '@/renderer/components/ui/input';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';import { Separator } from '@/renderer/components/ui/separator';-import { Input } from '@/renderer/components/ui/input';+import { useDatabase } from '@/renderer/contexts/database';import { useView } from '@/renderer/contexts/view';-import { useDrop } from 'react-dnd';import { cn } from '@/shared/lib/utils';-import { ArrowDownAz, ArrowDownZa, Filter, Type } from 'lucide-react';-import { useDatabase } from '@/renderer/contexts/database';export const TableViewNameHeader = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsxindex 70d9b509..d003a1e3 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx@@ -1,5 +1,6 @@-import { useDatabase } from '@/renderer/contexts/database';import { Plus } from 'lucide-react';++import { useDatabase } from '@/renderer/contexts/database';import { useView } from '@/renderer/contexts/view';export const TableViewRecordCreateRow = () => {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 0fd773e9..565a2323 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,9 +1,10 @@+import { extractNodeRole, RecordNode } from '@colanode/core';+import { TableViewNameCell } from '@/renderer/components/databases/tables/table-view-name-cell';import { RecordFieldValue } from '@/renderer/components/records/record-field-value';-import { extractNodeRole, RecordNode } from '@colanode/core';-import { useView } from '@/renderer/contexts/view';import { RecordProvider } from '@/renderer/components/records/record-provider';import { useDatabase } from '@/renderer/contexts/database';+import { useView } from '@/renderer/contexts/view';import { useWorkspace } from '@/renderer/contexts/workspace';interface TableViewRowProps {diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-settings.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-settings.tsxindex e7c6cf43..bc11da7f 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view-settings.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-settings.tsx@@ -1,27 +1,28 @@+import { Eye, EyeOff, Trash2 } from 'lucide-react';import React from 'react';++import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';+import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { ViewDeleteDialog } from '@/renderer/components/databases/view-delete-dialog';+import { ViewIcon } from '@/renderer/components/databases/view-icon';+import { ViewSettingsButton } from '@/renderer/components/databases/view-settings-button';+import { Button } from '@/renderer/components/ui/button';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { useView } from '@/renderer/contexts/view';import { Separator } from '@/renderer/components/ui/separator';-import { useDatabase } from '@/renderer/contexts/database';-import { cn } from '@/shared/lib/utils';+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import {Tooltip,TooltipContent,TooltipTrigger,} from '@/renderer/components/ui/tooltip';-import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';-import { ViewDeleteDialog } from '@/renderer/components/databases/view-delete-dialog';-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';-import { Button } from '@/renderer/components/ui/button';-import { Eye, EyeOff, Trash2 } from 'lucide-react';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { ViewIcon } from '@/renderer/components/databases/view-icon';-import { ViewSettingsButton } from '@/renderer/components/databases/view-settings-button';+import { useDatabase } from '@/renderer/contexts/database';+import { useView } from '@/renderer/contexts/view';+import { cn } from '@/shared/lib/utils';export const TableViewSettings = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view.tsxindex e71e489e..330eb9b9 100644--- a/apps/desktop/src/renderer/components/databases/tables/table-view.tsx+++ b/apps/desktop/src/renderer/components/databases/tables/table-view.tsx@@ -1,12 +1,13 @@import React from 'react';-import { TableViewHeader } from '@/renderer/components/databases/tables/table-view-header';++import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';+import { ViewSearchBar } from '@/renderer/components/databases/search/view-search-bar';+import { ViewSortButton } from '@/renderer/components/databases/search/view-sort-button';import { TableViewBody } from '@/renderer/components/databases/tables/table-view-body';+import { TableViewHeader } from '@/renderer/components/databases/tables/table-view-header';import { TableViewRecordCreateRow } from '@/renderer/components/databases/tables/table-view-record-create-row';-import { ViewTabs } from '@/renderer/components/databases/view-tabs';import { TableViewSettings } from '@/renderer/components/databases/tables/table-view-settings';-import { ViewSearchBar } from '@/renderer/components/databases/search/view-search-bar';-import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';-import { ViewSortButton } from '@/renderer/components/databases/search/view-sort-button';+import { ViewTabs } from '@/renderer/components/databases/view-tabs';export const TableView = () => {return (diff --git a/apps/desktop/src/renderer/components/databases/view-create-button.tsx b/apps/desktop/src/renderer/components/databases/view-create-button.tsxindex 4b099789..d14a0b27 100644--- a/apps/desktop/src/renderer/components/databases/view-create-button.tsx+++ b/apps/desktop/src/renderer/components/databases/view-create-button.tsx@@ -1,6 +1,7 @@+import { Plus } from 'lucide-react';import React from 'react';+import { ViewCreateDialog } from '@/renderer/components/databases/view-create-dialog';-import { Plus } from 'lucide-react';export const ViewCreateButton = () => {const [open, setOpen] = React.useState(false);diff --git a/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx b/apps/desktop/src/renderer/components/databases/view-create-dialog.tsxindex 4c83fbdf..9b04a53a 100644--- a/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx@@ -1,4 +1,12 @@+import { FieldAttributes, FieldType } from '@colanode/core';+import { zodResolver } from '@hookform/resolvers/zod';+import { Calendar, Columns, Table } from 'lucide-react';import React from 'react';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { FieldSelect } from '@/renderer/components/databases/fields/field-select';+import { Button } from '@/renderer/components/ui/button';import {Dialog,DialogContent,@@ -7,7 +15,6 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';-import { z } from 'zod';import {Form,FormControl,@@ -17,18 +24,12 @@ import {FormMessage,} from '@/renderer/components/ui/form';import { Input } from '@/renderer/components/ui/input';-import { Button } from '@/renderer/components/ui/button';import { Spinner } from '@/renderer/components/ui/spinner';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';-import { cn } from '@/shared/lib/utils';import { useDatabase } from '@/renderer/contexts/database';-import { FieldSelect } from '@/renderer/components/databases/fields/field-select';-import { toast } from '@/renderer/hooks/use-toast';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';-import { Calendar, Columns, Table } from 'lucide-react';-import { FieldAttributes, FieldType } from '@colanode/core';+import { useMutation } from '@/renderer/hooks/use-mutation';+import { toast } from '@/renderer/hooks/use-toast';+import { cn } from '@/shared/lib/utils';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),diff --git a/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsxindex d5aaabc3..03066f55 100644--- a/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/databases/view-delete-dialog.tsx@@ -8,9 +8,9 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';-import { useWorkspace } from '@/renderer/contexts/workspace';import { useDatabase } from '@/renderer/contexts/database';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface ViewDeleteDialogProps {id: string;diff --git a/apps/desktop/src/renderer/components/databases/view-icon.tsx b/apps/desktop/src/renderer/components/databases/view-icon.tsxindex 51c15380..0678f16f 100644--- a/apps/desktop/src/renderer/components/databases/view-icon.tsx+++ b/apps/desktop/src/renderer/components/databases/view-icon.tsx@@ -1,6 +1,7 @@-import { Avatar } from '@/renderer/components/avatars/avatar';import { Calendar, Database, SquareKanban, Table } from 'lucide-react';+import { Avatar } from '@/renderer/components/avatars/avatar';+interface ViewIconProps {id: string;name: string;diff --git a/apps/desktop/src/renderer/components/databases/view-tab.tsx b/apps/desktop/src/renderer/components/databases/view-tab.tsxindex 3622416c..6cb20e13 100644--- a/apps/desktop/src/renderer/components/databases/view-tab.tsx+++ b/apps/desktop/src/renderer/components/databases/view-tab.tsx@@ -1,6 +1,7 @@-import { cn } from '@/shared/lib/utils';import { ViewAttributes } from '@colanode/core';+import { ViewIcon } from '@/renderer/components/databases/view-icon';+import { cn } from '@/shared/lib/utils';interface ViewTabProps {view: ViewAttributes;diff --git a/apps/desktop/src/renderer/components/databases/view-tabs.tsx b/apps/desktop/src/renderer/components/databases/view-tabs.tsxindex b527c203..bfa64931 100644--- a/apps/desktop/src/renderer/components/databases/view-tabs.tsx+++ b/apps/desktop/src/renderer/components/databases/view-tabs.tsx@@ -1,7 +1,7 @@-import { ViewTab } from '@/renderer/components/databases/view-tab';import { ViewCreateButton } from '@/renderer/components/databases/view-create-button';-import { useDatabaseViews } from '@/renderer/contexts/database-views';+import { ViewTab } from '@/renderer/components/databases/view-tab';import { useDatabase } from '@/renderer/contexts/database';+import { useDatabaseViews } from '@/renderer/contexts/database-views';export const ViewTabs = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/databases/view.tsx b/apps/desktop/src/renderer/components/databases/view.tsxindex 8c9dd3e8..69436bd6 100644--- a/apps/desktop/src/renderer/components/databases/view.tsx+++ b/apps/desktop/src/renderer/components/databases/view.tsx@@ -1,19 +1,21 @@-import React from 'react';-import { match } from 'ts-pattern';import {+ compareString,SortDirection,ViewAttributes,ViewFieldFilterAttributes,ViewFilterAttributes,ViewSortAttributes,- compareString,} from '@colanode/core';-import { TableView } from '@/renderer/components/databases/tables/table-view';+import React from 'react';+import { match } from 'ts-pattern';+import { BoardView } from '@/renderer/components/databases/boards/board-view';import { CalendarView } from '@/renderer/components/databases/calendars/calendar-view';-import { ViewContext } from '@/renderer/contexts/view';+import { TableView } from '@/renderer/components/databases/tables/table-view';import { useDatabase } from '@/renderer/contexts/database';+import { ViewContext } from '@/renderer/contexts/view';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';import {generateFieldValuesFromFilters,generateViewFieldIndex,@@ -23,7 +25,6 @@ import {getFieldFilterOperators,} from '@/shared/lib/databases';import { ViewField } from '@/shared/types/databases';-import { useMutation } from '@/renderer/hooks/use-mutation';interface ViewProps {view: ViewAttributes;diff --git a/apps/desktop/src/renderer/components/documents/document-editor.tsx b/apps/desktop/src/renderer/components/documents/document-editor.tsxindex 8330782f..a07f6ccc 100644--- a/apps/desktop/src/renderer/components/documents/document-editor.tsx+++ b/apps/desktop/src/renderer/components/documents/document-editor.tsx@@ -1,59 +1,61 @@-import React from 'react';import '@/renderer/styles/editor.css';++import { EditorContent, JSONContent,useEditor } from '@tiptap/react';import { debounce } from 'lodash-es';-import { useEditor, EditorContent, JSONContent } from '@tiptap/react';+import React from 'react';++import { useWorkspace } from '@/renderer/contexts/workspace';import {- ParagraphCommand,BlockquoteCommand,+ BulletListCommand,+ CodeBlockCommand,+ DividerCommand,+ FileCommand,+ FolderCommand,Heading1Command,Heading2Command,Heading3Command,- BulletListCommand,- CodeBlockCommand,OrderedListCommand,- DividerCommand,- TodoCommand,PageCommand,- FolderCommand,- FileCommand,+ ParagraphCommand,+ TodoCommand,} from '@/renderer/editor/commands';import {- IdExtension,+ BlockquoteNode,+ BoldMark,+ BulletListNode,+ CodeBlockNode,+ CodeMark,+ ColorMark,+ CommanderExtension,+ DeleteControlExtension,+ DividerNode,DocumentNode,- PageNode,- FolderNode,+ DropcursorExtension,FileNode,- TextNode,- ParagraphNode,+ FolderNode,Heading1Node,Heading2Node,Heading3Node,- BlockquoteNode,- BulletListNode,- CodeBlockNode,- TabKeymapExtension,+ HighlightMark,+ IdExtension,+ ItalicMark,+ LinkMark,ListItemNode,ListKeymapExtension,OrderedListNode,+ PageNode,+ ParagraphNode,PlaceholderExtension,- TaskListNode,+ StrikethroughMark,+ TabKeymapExtension,TaskItemNode,- CommanderExtension,- DividerNode,+ TaskListNode,+ TextNode,TrailingNode,- BoldMark,- ItalicMark,UnderlineMark,- StrikethroughMark,- CodeMark,- ColorMark,- HighlightMark,- LinkMark,- DeleteControlExtension,- DropcursorExtension,} from '@/renderer/editor/extensions';import { EditorBubbleMenu } from '@/renderer/editor/menu/bubble-menu';-import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';interface DocumentEditorProps {diff --git a/apps/desktop/src/renderer/components/documents/document.tsx b/apps/desktop/src/renderer/components/documents/document.tsxindex b95cfecf..a7c4b82f 100644--- a/apps/desktop/src/renderer/components/documents/document.tsx+++ b/apps/desktop/src/renderer/components/documents/document.tsx@@ -1,4 +1,5 @@import { Block } from '@colanode/core';+import { DocumentEditor } from '@/renderer/components/documents/document-editor';import { mapBlocksToContents } from '@/shared/lib/editor';diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsxindex 8e5ad252..bf932112 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx@@ -1,6 +1,7 @@import React from 'react';-import { EmojiPickerRowData } from '@/shared/types/emojis';+import { EmojiPickerItem } from '@/renderer/components/emojis/emoji-picker-item';+import { EmojiPickerRowData } from '@/shared/types/emojis';interface EmojiPickerBrowserRowProps {index: number;diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsxindex 63b1f16a..cea4afa7 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx@@ -1,9 +1,10 @@-import { Emoji, EmojiPickerRowData } from '@/shared/types/emojis';import React from 'react';import AutoSizer from 'react-virtualized-auto-sizer';import { FixedSizeList } from 'react-window';+import { EmojiPickerBrowserRow } from '@/renderer/components/emojis/emoji-picker-browser-row';import { useEmojiPicker } from '@/renderer/contexts/emoji-picker';+import { Emoji, EmojiPickerRowData } from '@/shared/types/emojis';const emojisPerRow = 10;diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsxindex d8422aaf..8c556e01 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsx@@ -1,6 +1,6 @@-import { Emoji } from '@/shared/types/emojis';import { EmojiElement } from '@/renderer/components/emojis/emoji-element';import { useEmojiPicker } from '@/renderer/contexts/emoji-picker';+import { Emoji } from '@/shared/types/emojis';interface EmojiPickerItemProps {emoji: Emoji;diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker-search.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker-search.tsxindex 356df30f..fd6a5eb8 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-picker-search.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker-search.tsx@@ -1,7 +1,8 @@import React from 'react';-import { searchEmojis } from '@/shared/lib/emojis';+import { EmojiPickerItem } from '@/renderer/components/emojis/emoji-picker-item';import { useEmojiPicker } from '@/renderer/contexts/emoji-picker';+import { searchEmojis } from '@/shared/lib/emojis';interface EmojiPickerSearchProps {query: string;diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker.tsxindex 11a74077..061303ab 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker.tsx@@ -1,10 +1,11 @@import React from 'react';-import { EmojiSkinToneSelector } from '@/renderer/components/emojis/emoji-skin-tone-selector';-import { Emoji } from '@/shared/types/emojis';-import { EmojiPickerContext } from '@/renderer/contexts/emoji-picker';+import { EmojiPickerBrowser } from '@/renderer/components/emojis/emoji-picker-browser';import { EmojiPickerSearch } from '@/renderer/components/emojis/emoji-picker-search';+import { EmojiSkinToneSelector } from '@/renderer/components/emojis/emoji-skin-tone-selector';+import { EmojiPickerContext } from '@/renderer/contexts/emoji-picker';import { useQuery } from '@/renderer/hooks/use-query';+import { Emoji } from '@/shared/types/emojis';interface EmojiPickerProps {onPick: (emoji: Emoji, skinTone: number) => void;diff --git a/apps/desktop/src/renderer/components/emojis/emoji-skin-tone-selector.tsx b/apps/desktop/src/renderer/components/emojis/emoji-skin-tone-selector.tsxindex 7832fb12..0fa0886b 100644--- a/apps/desktop/src/renderer/components/emojis/emoji-skin-tone-selector.tsx+++ b/apps/desktop/src/renderer/components/emojis/emoji-skin-tone-selector.tsx@@ -1,11 +1,12 @@import React from 'react';-import { getEmojiUrl } from '@/shared/lib/emojis';+import { EmojiElement } from '@/renderer/components/emojis/emoji-element';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';+import { getEmojiUrl } from '@/shared/lib/emojis';const skins: string[] = ['01jc5vxx32ez8g5394y7mzt2vnem',diff --git a/apps/desktop/src/renderer/components/files/file-block.tsx b/apps/desktop/src/renderer/components/files/file-block.tsxindex 9a0550b2..439fd645 100644--- a/apps/desktop/src/renderer/components/files/file-block.tsx+++ b/apps/desktop/src/renderer/components/files/file-block.tsx@@ -1,6 +1,6 @@+import { FilePreview } from '@/renderer/components/files/file-preview';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { FilePreview } from '@/renderer/components/files/file-preview';interface FileBlockProps {id: string;diff --git a/apps/desktop/src/renderer/components/files/file-body.tsx b/apps/desktop/src/renderer/components/files/file-body.tsxindex 00cfbc8b..a9816a93 100644--- a/apps/desktop/src/renderer/components/files/file-body.tsx+++ b/apps/desktop/src/renderer/components/files/file-body.tsx@@ -1,9 +1,10 @@import { FileNode } from '@colanode/core';-import { Button } from '@/renderer/components/ui/button';-import { useWorkspace } from '@/renderer/contexts/workspace';import { SquareArrowOutUpRight } from 'lucide-react';+import { FilePreview } from '@/renderer/components/files/file-preview';import { FileSidebar } from '@/renderer/components/files/file-sidebar';+import { Button } from '@/renderer/components/ui/button';+import { useWorkspace } from '@/renderer/contexts/workspace';interface FileBodyProps {file: FileNode;diff --git a/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsxindex 9f856598..904dcd99 100644--- a/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsx@@ -1,4 +1,5 @@import { FileNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';interface FileBreadcrumbItemProps {diff --git a/apps/desktop/src/renderer/components/files/file-container.tsx b/apps/desktop/src/renderer/components/files/file-container.tsxindex ca276ab3..7497f42f 100644--- a/apps/desktop/src/renderer/components/files/file-container.tsx+++ b/apps/desktop/src/renderer/components/files/file-container.tsx@@ -1,8 +1,9 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';-import { FileHeader } from '@/renderer/components/files/file-header';import { extractNodeRole } from '@colanode/core';+import { FileBody } from '@/renderer/components/files/file-body';+import { FileHeader } from '@/renderer/components/files/file-header';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface FileContainerProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/files/file-context-menu.tsx b/apps/desktop/src/renderer/components/files/file-context-menu.tsxindex 44712421..5f8fc39e 100644--- a/apps/desktop/src/renderer/components/files/file-context-menu.tsx+++ b/apps/desktop/src/renderer/components/files/file-context-menu.tsx@@ -1,4 +1,6 @@+import { Folder, Trash2 } from 'lucide-react';import React from 'react';+import { FileDeleteDialog } from '@/renderer/components/files/file-delete-dialog';import {ContextMenu,@@ -8,7 +10,6 @@ import {ContextMenuTrigger,} from '@/renderer/components/ui/context-menu';import { useWorkspace } from '@/renderer/contexts/workspace';-import { Folder, Trash2 } from 'lucide-react';interface FileContextMenuProps {id: string;diff --git a/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx b/apps/desktop/src/renderer/components/files/file-delete-dialog.tsxindex c226a686..04cace6e 100644--- a/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/files/file-delete-dialog.tsx@@ -8,8 +8,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface FileDeleteDialogProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/files/file-download.tsx b/apps/desktop/src/renderer/components/files/file-download.tsxindex 942f8b1d..0cdec37e 100644--- a/apps/desktop/src/renderer/components/files/file-download.tsx+++ b/apps/desktop/src/renderer/components/files/file-download.tsx@@ -1,7 +1,8 @@+import { Download } from 'lucide-react';++import { Spinner } from '@/renderer/components/ui/spinner';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { Spinner } from '@/renderer/components/ui/spinner';-import { Download } from 'lucide-react';interface FileDownloadProps {id: string;diff --git a/apps/desktop/src/renderer/components/files/file-header.tsx b/apps/desktop/src/renderer/components/files/file-header.tsxindex ccd62c2f..ee95e3bb 100644--- a/apps/desktop/src/renderer/components/files/file-header.tsx+++ b/apps/desktop/src/renderer/components/files/file-header.tsx@@ -1,10 +1,11 @@-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { FileNode, Node, NodeRole } from '@colanode/core';-import { Header } from '@/renderer/components/ui/header';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';++import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { FileSettings } from '@/renderer/components/files/file-settings';-import { useContainer } from '@/renderer/contexts/container';+import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';+import { Header } from '@/renderer/components/ui/header';+import { useContainer } from '@/renderer/contexts/container';interface FileHeaderProps {nodes: Node[];diff --git a/apps/desktop/src/renderer/components/files/file-icon.tsx b/apps/desktop/src/renderer/components/files/file-icon.tsxindex 3ba7f1b2..e2b8b992 100644--- a/apps/desktop/src/renderer/components/files/file-icon.tsx+++ b/apps/desktop/src/renderer/components/files/file-icon.tsx@@ -1,4 +1,4 @@-import { FileImage, File, FileVideo, FileAudio, FileText } from 'lucide-react';+import { File, FileAudio, FileImage, FileText,FileVideo } from 'lucide-react';interface FileIconProps {mimeType: string;diff --git a/apps/desktop/src/renderer/components/files/file-preview.tsx b/apps/desktop/src/renderer/components/files/file-preview.tsxindex e30e865c..9673f3bf 100644--- a/apps/desktop/src/renderer/components/files/file-preview.tsx+++ b/apps/desktop/src/renderer/components/files/file-preview.tsx@@ -1,12 +1,13 @@+import { FileNode } from '@colanode/core';import { match } from 'ts-pattern';++import { FileDownload } from '@/renderer/components/files/file-download';import { FilePreviewImage } from '@/renderer/components/files/previews/file-preview-image';-import { FilePreviewVideo } from '@/renderer/components/files/previews/file-preview-video';import { FilePreviewOther } from '@/renderer/components/files/previews/file-preview-other';-import { FileNode } from '@colanode/core';+import { FilePreviewVideo } from '@/renderer/components/files/previews/file-preview-video';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';import { getFileUrl } from '@/shared/lib/files';-import { FileDownload } from '@/renderer/components/files/file-download';interface FilePreviewProps {file: FileNode;diff --git a/apps/desktop/src/renderer/components/files/file-settings.tsx b/apps/desktop/src/renderer/components/files/file-settings.tsxindex 7cc0c8af..52697224 100644--- a/apps/desktop/src/renderer/components/files/file-settings.tsx+++ b/apps/desktop/src/renderer/components/files/file-settings.tsx@@ -1,12 +1,13 @@+import { Copy, Settings, Trash2 } from 'lucide-react';import React from 'react';++import { FileDeleteDialog } from '@/renderer/components/files/file-delete-dialog';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Copy, Settings, Trash2 } from 'lucide-react';-import { FileDeleteDialog } from '@/renderer/components/files/file-delete-dialog';interface FileSettingsProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/files/file-sidebar.tsx b/apps/desktop/src/renderer/components/files/file-sidebar.tsxindex 1d3d4222..6cb28769 100644--- a/apps/desktop/src/renderer/components/files/file-sidebar.tsx+++ b/apps/desktop/src/renderer/components/files/file-sidebar.tsx@@ -1,10 +1,11 @@+import { FileNode, formatDate } from '@colanode/core';import React from 'react';-import { formatBytes } from '@/shared/lib/files';-import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';+import { Avatar } from '@/renderer/components/avatars/avatar';-import { FileNode, formatDate } from '@colanode/core';+import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';+import { formatBytes } from '@/shared/lib/files';interface FileSidebarProps {file: FileNode;diff --git a/apps/desktop/src/renderer/components/files/file-thumbnail.tsx b/apps/desktop/src/renderer/components/files/file-thumbnail.tsxindex dd64588b..7da30e6e 100644--- a/apps/desktop/src/renderer/components/files/file-thumbnail.tsx+++ b/apps/desktop/src/renderer/components/files/file-thumbnail.tsx@@ -1,9 +1,10 @@-import { getFileUrl } from '@/shared/lib/files';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { FileIcon } from '@/renderer/components/files/file-icon';-import { cn } from '@/shared/lib/utils';import { FileNode } from '@colanode/core';++import { FileIcon } from '@/renderer/components/files/file-icon';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';+import { getFileUrl } from '@/shared/lib/files';+import { cn } from '@/shared/lib/utils';interface FileThumbnailProps {file: FileNode;diff --git a/apps/desktop/src/renderer/components/files/previews/file-preview-other.tsx b/apps/desktop/src/renderer/components/files/previews/file-preview-other.tsxindex 68824e1e..9f28b7dd 100644--- a/apps/desktop/src/renderer/components/files/previews/file-preview-other.tsx+++ b/apps/desktop/src/renderer/components/files/previews/file-preview-other.tsx@@ -1,5 +1,5 @@-import { getFriendlyNameFromMimeType } from '@/shared/lib/files';import { FileIcon } from '@/renderer/components/files/file-icon';+import { getFriendlyNameFromMimeType } from '@/shared/lib/files';interface FilePreviewOtherProps {mimeType: string;diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsxindex 6b05ccbf..ac271d60 100644--- a/apps/desktop/src/renderer/components/folders/folder-body.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx@@ -1,6 +1,15 @@-import React from 'react';import { FolderNode } from '@colanode/core';-import { Dropzone } from '@/renderer/components/ui/dropzone';+import {+ Check,+ Filter,+ GalleryVertical,+ LayoutGrid,+ List,+ Upload,+} from 'lucide-react';+import React from 'react';++import { FolderFiles } from '@/renderer/components/folders/folder-files';import { Button } from '@/renderer/components/ui/button';import {DropdownMenu,@@ -10,19 +19,11 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { FolderLayoutType } from '@/shared/types/folders';+import { Dropzone } from '@/renderer/components/ui/dropzone';import { ScrollArea } from '@/renderer/components/ui/scroll-area';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';-import { FolderFiles } from '@/renderer/components/folders/folder-files';-import {- Check,- Filter,- GalleryVertical,- LayoutGrid,- List,- Upload,-} from 'lucide-react';+import { useMutation } from '@/renderer/hooks/use-mutation';+import { FolderLayoutType } from '@/shared/types/folders';export type FolderLayout = {value: FolderLayoutType;diff --git a/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsxindex 40de356b..05658d27 100644--- a/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx@@ -1,4 +1,5 @@import { FolderNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';interface FolderBreadcrumbItemProps {diff --git a/apps/desktop/src/renderer/components/folders/folder-container.tsx b/apps/desktop/src/renderer/components/folders/folder-container.tsxindex 45e301f2..84449200 100644--- a/apps/desktop/src/renderer/components/folders/folder-container.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-container.tsx@@ -1,8 +1,9 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';import { extractNodeRole } from '@colanode/core';++import { FolderBody } from '@/renderer/components/folders/folder-body';import { FolderHeader } from '@/renderer/components/folders/folder-header';-import { FolderBody } from './folder-body';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface FolderContainerProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsxindex 4881f2fb..81007335 100644--- a/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx@@ -1,4 +1,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { generateId,IdType } from '@colanode/core';++import { FolderForm } from '@/renderer/components/folders/folder-form';import {Dialog,DialogContent,@@ -6,9 +8,8 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { IdType, generateId } from '@colanode/core';-import { FolderForm } from '@/renderer/components/folders/folder-form';interface FolderCreateDialogProps {spaceId: string;diff --git a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsxindex 6c9a15f9..3f941897 100644--- a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx@@ -8,8 +8,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface FolderDeleteDialogProps {open: boolean;diff --git a/apps/desktop/src/renderer/components/folders/folder-files.tsx b/apps/desktop/src/renderer/components/folders/folder-files.tsxindex b91692ce..40b9c71f 100644--- a/apps/desktop/src/renderer/components/folders/folder-files.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-files.tsx@@ -1,14 +1,15 @@+import { getIdType, IdType } from '@colanode/core';import React from 'react';import { match } from 'ts-pattern';++import { GalleryLayout } from '@/renderer/components/folders/galleries/gallery-layout';+import { GridLayout } from '@/renderer/components/folders/grids/grid-layout';+import { ListLayout } from '@/renderer/components/folders/lists/list-layout';import { FolderContext } from '@/renderer/contexts/folder';-import { FolderLayoutType } from '@/shared/types/folders';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQueries } from '@/renderer/hooks/use-queries';-import { GridLayout } from '@/renderer/components/folders/grids/grid-layout';-import { ListLayout } from '@/renderer/components/folders/lists/list-layout';-import { GalleryLayout } from '@/renderer/components/folders/galleries/gallery-layout';-import { getIdType, IdType } from '@colanode/core';import { FileListQueryInput } from '@/shared/queries/file-list';+import { FolderLayoutType } from '@/shared/types/folders';const FILES_PER_PAGE = 100;diff --git a/apps/desktop/src/renderer/components/folders/folder-form.tsx b/apps/desktop/src/renderer/components/folders/folder-form.tsxindex 863cbe48..475ef666 100644--- a/apps/desktop/src/renderer/components/folders/folder-form.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-form.tsx@@ -1,4 +1,10 @@+import { zodResolver } from '@hookform/resolvers/zod';+import { useForm } from 'react-hook-form';import { z } from 'zod';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Button } from '@/renderer/components/ui/button';import {Form,FormControl,@@ -6,13 +12,8 @@ import {FormItem,FormMessage,} from '@/renderer/components/ui/form';-import { Button } from '@/renderer/components/ui/button';-import { Spinner } from '@/renderer/components/ui/spinner';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';import { Input } from '@/renderer/components/ui/input';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Spinner } from '@/renderer/components/ui/spinner';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),diff --git a/apps/desktop/src/renderer/components/folders/folder-header.tsx b/apps/desktop/src/renderer/components/folders/folder-header.tsxindex 8bf82ae4..607dd3eb 100644--- a/apps/desktop/src/renderer/components/folders/folder-header.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-header.tsx@@ -1,9 +1,10 @@-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';import { FolderNode, Node, NodeRole } from '@colanode/core';-import { Header } from '@/renderer/components/ui/header';-import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';++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 { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';interface FolderHeaderProps {diff --git a/apps/desktop/src/renderer/components/folders/folder-settings.tsx b/apps/desktop/src/renderer/components/folders/folder-settings.tsxindex 22e78d99..a8dd4791 100644--- a/apps/desktop/src/renderer/components/folders/folder-settings.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-settings.tsx@@ -1,4 +1,10 @@+import { FolderNode, hasEditorAccess, NodeRole } 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 { FolderDeleteDialog } from '@/renderer/components/folders/folder-delete-dialog';+import { FolderUpdateDialog } from '@/renderer/components/folders/folder-update-dialog';import {DropdownMenu,DropdownMenuContent,@@ -7,11 +13,6 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';-import { FolderNode, hasEditorAccess, NodeRole } from '@colanode/core';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';-import { FolderDeleteDialog } from '@/renderer/components/folders/folder-delete-dialog';-import { FolderUpdateDialog } from '@/renderer/components/folders/folder-update-dialog';interface FolderSettingsProps {folder: FolderNode;diff --git a/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx b/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsxindex 0b8ec7a5..6f0dedc6 100644--- a/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx@@ -1,7 +1,8 @@-import { cn } from '@/shared/lib/utils';import { FolderNode } 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;diff --git a/apps/desktop/src/renderer/components/folders/folder-update-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-update-dialog.tsxindex 99cdc10c..48d2d54a 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,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { FolderNode, hasEditorAccess, NodeRole } from '@colanode/core';++import { FolderForm } from '@/renderer/components/folders/folder-form';import {Dialog,DialogContent,@@ -6,10 +8,9 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { FolderNode, hasEditorAccess, NodeRole } from '@colanode/core';import { toast } from '@/renderer/hooks/use-toast';-import { FolderForm } from '@/renderer/components/folders/folder-form';interface FolderUpdateDialogProps {folder: FolderNode;diff --git a/apps/desktop/src/renderer/components/folders/grids/grid-file.tsx b/apps/desktop/src/renderer/components/folders/grids/grid-file.tsxindex ee8b36fb..88db7656 100644--- a/apps/desktop/src/renderer/components/folders/grids/grid-file.tsx+++ b/apps/desktop/src/renderer/components/folders/grids/grid-file.tsx@@ -1,6 +1,7 @@import { FileNode } from '@colanode/core';-import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';+import { FileContextMenu } from '@/renderer/components/files/file-context-menu';+import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';import { GridItem } from '@/renderer/components/folders/grids/grid-item';interface GridFileProps {diff --git a/apps/desktop/src/renderer/components/folders/grids/grid-item.tsx b/apps/desktop/src/renderer/components/folders/grids/grid-item.tsxindex edb013ca..4946dc50 100644--- a/apps/desktop/src/renderer/components/folders/grids/grid-item.tsx+++ b/apps/desktop/src/renderer/components/folders/grids/grid-item.tsx@@ -1,6 +1,7 @@import React from 'react';-import { cn } from '@/shared/lib/utils';+import { useFolder } from '@/renderer/contexts/folder';+import { cn } from '@/shared/lib/utils';interface GridItemProps {id: string;diff --git a/apps/desktop/src/renderer/components/folders/grids/grid-layout.tsx b/apps/desktop/src/renderer/components/folders/grids/grid-layout.tsxindex fb6bbbf2..34234c41 100644--- a/apps/desktop/src/renderer/components/folders/grids/grid-layout.tsx+++ b/apps/desktop/src/renderer/components/folders/grids/grid-layout.tsx@@ -1,5 +1,5 @@-import { useFolder } from '@/renderer/contexts/folder';import { GridFile } from '@/renderer/components/folders/grids/grid-file';+import { useFolder } from '@/renderer/contexts/folder';export const GridLayout = () => {const folder = useFolder();diff --git a/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsx b/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsxindex 97b06b9d..c663e4e0 100644--- a/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsx+++ b/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsx@@ -1,6 +1,7 @@import React from 'react';-import { IconPickerRowData } from '@/shared/types/icons';+import { IconPickerItem } from '@/renderer/components/icons/icon-picker-item';+import { IconPickerRowData } from '@/shared/types/icons';interface IconPickerBrowserRowProps {index: number;diff --git a/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsx b/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsxindex f6582352..4e6dfbf4 100644--- a/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsx+++ b/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsx@@ -1,9 +1,10 @@import React from 'react';import AutoSizer from 'react-virtualized-auto-sizer';import { FixedSizeList } from 'react-window';-import { Icon, IconPickerRowData } from '@/shared/types/icons';+import { IconPickerBrowserRow } from '@/renderer/components/icons/icon-picker-browser-row';import { useIconPicker } from '@/renderer/contexts/icon-picker';+import { Icon, IconPickerRowData } from '@/shared/types/icons';const iconsPerRow = 10;diff --git a/apps/desktop/src/renderer/components/icons/icon-picker-item.tsx b/apps/desktop/src/renderer/components/icons/icon-picker-item.tsxindex ebd6088e..dca518b5 100644--- a/apps/desktop/src/renderer/components/icons/icon-picker-item.tsx+++ b/apps/desktop/src/renderer/components/icons/icon-picker-item.tsx@@ -1,6 +1,6 @@-import { Icon } from '@/shared/types/icons';-import { useIconPicker } from '@/renderer/contexts/icon-picker';import { IconElement } from '@/renderer/components/icons/icon-element';+import { useIconPicker } from '@/renderer/contexts/icon-picker';+import { Icon } from '@/shared/types/icons';interface IconPickerItemProps {icon: Icon;diff --git a/apps/desktop/src/renderer/components/icons/icon-picker-search.tsx b/apps/desktop/src/renderer/components/icons/icon-picker-search.tsxindex 381fc4d7..293fd6e2 100644--- a/apps/desktop/src/renderer/components/icons/icon-picker-search.tsx+++ b/apps/desktop/src/renderer/components/icons/icon-picker-search.tsx@@ -1,7 +1,8 @@import React from 'react';+import { IconPickerItem } from '@/renderer/components/icons/icon-picker-item';-import { searchIcons } from '@/shared/lib/icons';import { useIconPicker } from '@/renderer/contexts/icon-picker';+import { searchIcons } from '@/shared/lib/icons';interface IconPickerSearchProps {query: string;diff --git a/apps/desktop/src/renderer/components/icons/icon-picker.tsx b/apps/desktop/src/renderer/components/icons/icon-picker.tsxindex bb27bff6..24883cc7 100644--- a/apps/desktop/src/renderer/components/icons/icon-picker.tsx+++ b/apps/desktop/src/renderer/components/icons/icon-picker.tsx@@ -1,9 +1,10 @@import React from 'react';-import { Icon } from '@/shared/types/icons';-import { IconPickerContext } from '@/renderer/contexts/icon-picker';-import { IconPickerSearch } from '@/renderer/components/icons/icon-picker-search';+import { IconPickerBrowser } from '@/renderer/components/icons/icon-picker-browser';+import { IconPickerSearch } from '@/renderer/components/icons/icon-picker-search';+import { IconPickerContext } from '@/renderer/contexts/icon-picker';import { useQuery } from '@/renderer/hooks/use-query';+import { Icon } from '@/shared/types/icons';interface IconPickerProps {onPick: (icon: Icon) => void;diff --git a/apps/desktop/src/renderer/components/layouts/layout-main.tsx b/apps/desktop/src/renderer/components/layouts/layout-main.tsxindex 1e418dde..d800c479 100644--- a/apps/desktop/src/renderer/components/layouts/layout-main.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-main.tsx@@ -1,5 +1,5 @@-import { ContainerContext } from '@/renderer/contexts/container';import { NodeContainer } from '@/renderer/components/layouts/node-container';+import { ContainerContext } from '@/renderer/contexts/container';interface LayoutMainProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/layouts/layout-modal.tsx b/apps/desktop/src/renderer/components/layouts/layout-modal.tsxindex 14ec92dc..83e16d0f 100644--- a/apps/desktop/src/renderer/components/layouts/layout-modal.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-modal.tsx@@ -1,13 +1,14 @@+import { VisuallyHidden } from '@radix-ui/react-visually-hidden';import React from 'react';++import { NodeContainer } from '@/renderer/components/layouts/node-container';import {Dialog,DialogContent,DialogTitle,} from '@/renderer/components/ui/dialog';import { ContainerContext } from '@/renderer/contexts/container';-import { NodeContainer } from '@/renderer/components/layouts/node-container';import { useWorkspace } from '@/renderer/contexts/workspace';-import { VisuallyHidden } from '@radix-ui/react-visually-hidden';interface LayoutModalProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/layouts/layout-right.tsx b/apps/desktop/src/renderer/components/layouts/layout-right.tsxindex f9eabae4..95289003 100644--- a/apps/desktop/src/renderer/components/layouts/layout-right.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-right.tsx@@ -1,5 +1,5 @@-import { ContainerContext } from '@/renderer/contexts/container';import { NodeContainer } from '@/renderer/components/layouts/node-container';+import { ContainerContext } from '@/renderer/contexts/container';interface LayoutRightProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsxindex 74cf0d41..b8df8c35 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx@@ -1,7 +1,7 @@-import { ChatCreatePopover } from '@/renderer/components/chats/chat-create-popover';-import { useQuery } from '@/renderer/hooks/use-query';-import { useWorkspace } from '@/renderer/contexts/workspace';+import { ChatNode } from '@colanode/core';+import { ChatCreatePopover } from '@/renderer/components/chats/chat-create-popover';+import { ChatSidebarItem } from '@/renderer/components/chats/chat-sidebar-item';import {SidebarGroup,SidebarGroupAction,@@ -10,8 +10,8 @@ import {SidebarMenuButton,SidebarMenuItem,} from '@/renderer/components/ui/sidebar';-import { ChatNode } from '@colanode/core';-import { ChatSidebarItem } from '@/renderer/components/chats/chat-sidebar-item';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';export const LayoutSidebarChats = () => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsxindex 096eeebf..11be90cb 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx@@ -1,4 +1,9 @@+import { Check, ChevronsUpDown, LogOut, Plus, Settings } from 'lucide-react';import React from 'react';+import { useNavigate } from 'react-router-dom';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';import {DropdownMenu,DropdownMenuContent,@@ -12,12 +17,8 @@ import {SidebarMenuButton,SidebarMenuItem,} from '@/renderer/components/ui/sidebar';-import { Avatar } from '@/renderer/components/avatars/avatar';import { useAccount } from '@/renderer/contexts/account';-import { Check, ChevronsUpDown, LogOut, Plus, Settings } from 'lucide-react';-import { useNavigate } from 'react-router-dom';import { useRadar } from '@/renderer/contexts/radar';-import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';import { useQuery } from '@/renderer/hooks/use-query';import { AccountReadState } from '@/shared/types/radars';diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsxindex b5ad252a..5b37792c 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx@@ -1,8 +1,9 @@+import { Bell, Check,ChevronsUpDown, Plus, Settings } from 'lucide-react';import React from 'react';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { useAccount } from '@/renderer/contexts/account';import { useNavigate } from 'react-router-dom';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';import {DropdownMenu,DropdownMenuContent,@@ -16,9 +17,9 @@ import {SidebarMenuButton,SidebarMenuItem,} from '@/renderer/components/ui/sidebar';-import { ChevronsUpDown, Settings, Plus, Bell, Check } from 'lucide-react';+import { useAccount } from '@/renderer/contexts/account';import { useRadar } from '@/renderer/contexts/radar';-import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';export const LayoutSidebarHeader = () => {diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsxindex 5ca1a63e..e1704449 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-spaces.tsx@@ -1,14 +1,15 @@-import { useQuery } from '@/renderer/hooks/use-query';-import { useWorkspace } from '@/renderer/contexts/workspace';+import { SpaceNode } from '@colanode/core';++import { SpaceCreateButton } from '@/renderer/components/spaces/space-create-button';+import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';import {SidebarGroup,SidebarGroupAction,SidebarGroupLabel,SidebarMenu,} from '@/renderer/components/ui/sidebar';-import { SpaceCreateButton } from '@/renderer/components/spaces/space-create-button';-import { SpaceNode } from '@colanode/core';-import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';export const LayoutSidebarSpaces = () => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsxindex c5a4cbde..f38ef026 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar.tsx@@ -1,3 +1,7 @@+import { LayoutSidebarChats } from '@/renderer/components/layouts/layout-sidebar-chats';+import { LayoutSidebarFooter } from '@/renderer/components/layouts/layout-sidebar-footer';+import { LayoutSidebarHeader } from '@/renderer/components/layouts/layout-sidebar-header';+import { LayoutSidebarSpaces } from '@/renderer/components/layouts/layout-sidebar-spaces';import {Sidebar,SidebarContent,@@ -6,11 +10,6 @@ import {SidebarRail,} from '@/renderer/components/ui/sidebar';-import { LayoutSidebarHeader } from '@/renderer/components/layouts/layout-sidebar-header';-import { LayoutSidebarSpaces } from '@/renderer/components/layouts/layout-sidebar-spaces';-import { LayoutSidebarChats } from '@/renderer/components/layouts/layout-sidebar-chats';-import { LayoutSidebarFooter } from '@/renderer/components/layouts/layout-sidebar-footer';-export const LayoutSidebar = () => {return (<Sidebar collapsible="icon">diff --git a/apps/desktop/src/renderer/components/layouts/layout.tsx b/apps/desktop/src/renderer/components/layouts/layout.tsxindex f07268a0..4ab74b7e 100644--- a/apps/desktop/src/renderer/components/layouts/layout.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout.tsx@@ -1,10 +1,10 @@+import { LayoutMain } from '@/renderer/components/layouts/layout-main';+import { LayoutModal } from '@/renderer/components/layouts/layout-modal';import { LayoutSidebar } from '@/renderer/components/layouts/layout-sidebar';import {SidebarInset,SidebarProvider,} from '@/renderer/components/ui/sidebar';-import { LayoutMain } from '@/renderer/components/layouts/layout-main';-import { LayoutModal } from '@/renderer/components/layouts/layout-modal';interface LayoutProps {main?: string | null;diff --git a/apps/desktop/src/renderer/components/layouts/node-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/layouts/node-breadcrumb-item.tsxindex a9451c46..e50434bd 100644--- a/apps/desktop/src/renderer/components/layouts/node-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/layouts/node-breadcrumb-item.tsx@@ -1,13 +1,14 @@import { Node } from '@colanode/core';-import { SpaceBreadcrumbItem } from '@/renderer/components/spaces/space-breadcrumb-item';+import { ChannelBreadcrumbItem } from '@/renderer/components/channels/channel-breadcrumb-item';import { ChatBreadcrumbItem } from '@/renderer/components/chats/chat-breadcrumb-item';-import { PageBreadcrumbItem } from '@/renderer/components/pages/page-breadcrumb-item';import { DatabaseBreadcrumbItem } from '@/renderer/components/databases/database-breadcrumb-item';-import { RecordBreadcrumbItem } from '@/renderer/components/records/record-breadcrumb-item';-import { FolderBreadcrumbItem } from '@/renderer/components/folders/folder-breadcrumb-item';import { FileBreadcrumbItem } from '@/renderer/components/files/file-breadcrumb-item';+import { FolderBreadcrumbItem } from '@/renderer/components/folders/folder-breadcrumb-item';import { MessageBreadcrumbItem } from '@/renderer/components/messages/message-breadcrumb-item';+import { PageBreadcrumbItem } from '@/renderer/components/pages/page-breadcrumb-item';+import { RecordBreadcrumbItem } from '@/renderer/components/records/record-breadcrumb-item';+import { SpaceBreadcrumbItem } from '@/renderer/components/spaces/space-breadcrumb-item';interface NodeBreadcrumbItemProps {node: Node;diff --git a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx b/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsxindex fc65d550..db275ea2 100644--- a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx+++ b/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx@@ -1,11 +1,13 @@-import React from 'react';import { Node, NodeTypes } from '@colanode/core';+import React from 'react';++import { NodeBreadcrumbItem } from '@/renderer/components/layouts/node-breadcrumb-item';import {Breadcrumb,+ BreadcrumbEllipsis,BreadcrumbItem,BreadcrumbList,BreadcrumbSeparator,- BreadcrumbEllipsis,} from '@/renderer/components/ui/breadcrumb';import {DropdownMenu,@@ -14,7 +16,6 @@ import {DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';import { useWorkspace } from '@/renderer/contexts/workspace';-import { NodeBreadcrumbItem } from '@/renderer/components/layouts/node-breadcrumb-item';interface NodeBreadcrumbProps {nodes: Node[];diff --git a/apps/desktop/src/renderer/components/layouts/node-container.tsx b/apps/desktop/src/renderer/components/layouts/node-container.tsxindex 173f50f8..7a6c729a 100644--- a/apps/desktop/src/renderer/components/layouts/node-container.tsx+++ b/apps/desktop/src/renderer/components/layouts/node-container.tsx@@ -1,11 +1,12 @@-import { PageContainer } from '@/renderer/components/pages/page-container';+import { getIdType, IdType } from '@colanode/core';+import { ChannelContainer } from '@/renderer/components/channels/channel-container';-import { DatabaseContainer } from '@/renderer/components/databases/database-container';-import { RecordContainer } from '@/renderer/components/records/record-container';import { ChatContainer } from '@/renderer/components/chats/chat-container';-import { FolderContainer } from '@/renderer/components/folders/folder-container';+import { DatabaseContainer } from '@/renderer/components/databases/database-container';import { FileContainer } from '@/renderer/components/files/file-container';-import { getIdType, IdType } from '@colanode/core';+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;diff --git a/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx b/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsxindex 3e488812..88f94b4c 100644--- a/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx+++ b/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx@@ -1,6 +1,7 @@-import { useWorkspace } from '@/renderer/contexts/workspace';import { Fullscreen } from 'lucide-react';+import { useWorkspace } from '@/renderer/contexts/workspace';+interface NodeFullscreenButtonProps {nodeId: string;}diff --git a/apps/desktop/src/renderer/components/layouts/node-sidebar-item.tsx b/apps/desktop/src/renderer/components/layouts/node-sidebar-item.tsxindex 01587e11..05bc04bf 100644--- a/apps/desktop/src/renderer/components/layouts/node-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/layouts/node-sidebar-item.tsx@@ -1,11 +1,12 @@-import React from 'react';import { Node } from '@colanode/core';-import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';+import React from 'react';+import { ChannelSidebarItem } from '@/renderer/components/channels/channel-sidebar-item';import { ChatSidebarItem } from '@/renderer/components/chats/chat-sidebar-item';-import { PageSidebarItem } from '@/renderer/components/pages/page-sidebar-item';import { DatabaseSidebarItem } from '@/renderer/components/databases/database-sidiebar-item';import { FolderSidebarItem } from '@/renderer/components/folders/folder-sidebar-item';+import { PageSidebarItem } from '@/renderer/components/pages/page-sidebar-item';+import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';interface NodeSidebarItemProps {node: Node;diff --git a/apps/desktop/src/renderer/components/messages/conversation.tsx b/apps/desktop/src/renderer/components/messages/conversation.tsxindex dbc57422..378632f0 100644--- a/apps/desktop/src/renderer/components/messages/conversation.tsx+++ b/apps/desktop/src/renderer/components/messages/conversation.tsx@@ -1,16 +1,17 @@+import {+ hasAdminAccess,+ hasCollaboratorAccess,+ NodeRole,+} from '@colanode/core';import React from 'react';-import { MessageList } from '@/renderer/components/messages/message-list';+import { InView } from 'react-intersection-observer';+import {MessageCreate,MessageCreateRefProps,} from '@/renderer/components/messages/message-create';+import { MessageList } from '@/renderer/components/messages/message-list';import { ScrollArea } from '@/renderer/components/ui/scroll-area';-import { InView } from 'react-intersection-observer';-import {- hasAdminAccess,- hasCollaboratorAccess,- NodeRole,-} from '@colanode/core';import { ConversationContext } from '@/renderer/contexts/conversation';import { useWorkspace } from '@/renderer/contexts/workspace';diff --git a/apps/desktop/src/renderer/components/messages/message-actions.tsx b/apps/desktop/src/renderer/components/messages/message-actions.tsxindex 1d2c0035..e015fc0e 100644--- a/apps/desktop/src/renderer/components/messages/message-actions.tsx+++ b/apps/desktop/src/renderer/components/messages/message-actions.tsx@@ -1,13 +1,14 @@-import React from 'react';-import { useConversation } from '@/renderer/contexts/conversation';import { MessageNode } from '@colanode/core';import { MessagesSquare, Reply } from 'lucide-react';-import { MessageReactionCreatePopover } from '@/renderer/components/messages/message-reaction-create-popover';-import { useMutation } from '@/renderer/hooks/use-mutation';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { MessageDeleteButton } from '@/renderer/components/messages/message-delete-button';+import React from 'react';+import { EmojiElement } from '@/renderer/components/emojis/emoji-element';+import { MessageDeleteButton } from '@/renderer/components/messages/message-delete-button';+import { MessageReactionCreatePopover } from '@/renderer/components/messages/message-reaction-create-popover';import { Separator } from '@/renderer/components/ui/separator';+import { useConversation } from '@/renderer/contexts/conversation';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';const MessageAction = ({ children }: { children: React.ReactNode }) => {return (diff --git a/apps/desktop/src/renderer/components/messages/message-author-avatar.tsx b/apps/desktop/src/renderer/components/messages/message-author-avatar.tsxindex 5dff9bc6..c9a489b8 100644--- a/apps/desktop/src/renderer/components/messages/message-author-avatar.tsx+++ b/apps/desktop/src/renderer/components/messages/message-author-avatar.tsx@@ -1,7 +1,8 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';import { MessageNode, UserNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface MessageAuthorAvatarProps {message: MessageNode;diff --git a/apps/desktop/src/renderer/components/messages/message-content.tsx b/apps/desktop/src/renderer/components/messages/message-content.tsxindex 621cfae4..d734c0d1 100644--- a/apps/desktop/src/renderer/components/messages/message-content.tsx+++ b/apps/desktop/src/renderer/components/messages/message-content.tsx@@ -1,6 +1,7 @@+import { MessageNode } from '@colanode/core';+import { NodeRenderer } from '@/renderer/editor/renderers/node';import { mapBlocksToContents } from '@/shared/lib/editor';-import { MessageNode } from '@colanode/core';interface MessageContentProps {message: MessageNode;diff --git a/apps/desktop/src/renderer/components/messages/message-create.tsx b/apps/desktop/src/renderer/components/messages/message-create.tsxindex 5c281273..50693095 100644--- a/apps/desktop/src/renderer/components/messages/message-create.tsx+++ b/apps/desktop/src/renderer/components/messages/message-create.tsx@@ -1,24 +1,25 @@+import { MessageNode } from '@colanode/core';+import { JSONContent } from '@tiptap/core';+import { Plus, Search, Send, Upload } from 'lucide-react';import React from 'react';+import {MessageEditor,MessageEditorRefProps,} from '@/renderer/components/messages/message-editor';-import { useMutation } from '@/renderer/hooks/use-mutation';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { MessageNode } from '@colanode/core';-import { editorHasContent } from '@/shared/lib/editor';-import { useConversation } from '@/renderer/contexts/conversation';import { MessageReplyBanner } from '@/renderer/components/messages/message-reply-banner';-import { JSONContent } from '@tiptap/core';-import { Spinner } from '@/renderer/components/ui/spinner';-import { Send, Plus, Search, Upload } from 'lucide-react';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';+import { Spinner } from '@/renderer/components/ui/spinner';+import { useConversation } from '@/renderer/contexts/conversation';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';+import { editorHasContent } from '@/shared/lib/editor';export interface MessageCreateRefProps {setReplyTo: (replyTo: MessageNode) => void;diff --git a/apps/desktop/src/renderer/components/messages/message-delete-button.tsx b/apps/desktop/src/renderer/components/messages/message-delete-button.tsxindex 817f3b4b..cde77e75 100644--- a/apps/desktop/src/renderer/components/messages/message-delete-button.tsx+++ b/apps/desktop/src/renderer/components/messages/message-delete-button.tsx@@ -1,4 +1,6 @@+import { Trash2 } from 'lucide-react';import React from 'react';+import {AlertDialog,AlertDialogCancel,@@ -9,9 +11,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';-import { Trash2 } from 'lucide-react';+import { useMutation } from '@/renderer/hooks/use-mutation';interface MessageDeleteButtonProps {id: string;diff --git a/apps/desktop/src/renderer/components/messages/message-editor.tsx b/apps/desktop/src/renderer/components/messages/message-editor.tsxindex 280f3f17..181c5fc2 100644--- a/apps/desktop/src/renderer/components/messages/message-editor.tsx+++ b/apps/desktop/src/renderer/components/messages/message-editor.tsx@@ -1,28 +1,29 @@-import React from 'react';import type { JSONContent } from '@tiptap/core';import { EditorContent, useEditor } from '@tiptap/react';import isHotkey from 'is-hotkey';+import React from 'react';+import {- MessageNode,- TextNode,- ParagraphNode,- CodeBlockNode,- TabKeymapExtension,- PlaceholderExtension,- DividerNode,- TrailingNode,BoldMark,- ItalicMark,- UnderlineMark,- StrikethroughMark,+ CodeBlockNode,CodeMark,ColorMark,- HighlightMark,- LinkMark,- IdExtension,+ DividerNode,DropcursorExtension,- FilePlaceholderNode,FileNode,+ FilePlaceholderNode,+ HighlightMark,+ IdExtension,+ ItalicMark,+ LinkMark,+ MessageNode,+ ParagraphNode,+ PlaceholderExtension,+ StrikethroughMark,+ TabKeymapExtension,+ TextNode,+ TrailingNode,+ UnderlineMark,} from '@/renderer/editor/extensions';import { EditorBubbleMenu } from '@/renderer/editor/menu/bubble-menu';import { FileMetadata } from '@/shared/types/files';diff --git a/apps/desktop/src/renderer/components/messages/message-gif-picker.tsx b/apps/desktop/src/renderer/components/messages/message-gif-picker.tsxindex a73ce71b..65c3ffbc 100644--- a/apps/desktop/src/renderer/components/messages/message-gif-picker.tsx+++ b/apps/desktop/src/renderer/components/messages/message-gif-picker.tsx@@ -1,10 +1,11 @@+import { ImagePlay } from 'lucide-react';import React from 'react';+import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { ImagePlay } from 'lucide-react';export const MessageGifPicker = () => {const [open, setOpen] = React.useState(false);diff --git a/apps/desktop/src/renderer/components/messages/message-list.tsx b/apps/desktop/src/renderer/components/messages/message-list.tsxindex f2ed419d..8b48c593 100644--- a/apps/desktop/src/renderer/components/messages/message-list.tsx+++ b/apps/desktop/src/renderer/components/messages/message-list.tsx@@ -1,11 +1,12 @@+import { compareString } from '@colanode/core';import React from 'react';import { InView } from 'react-intersection-observer';+import { Message } from '@/renderer/components/messages/message';+import { useConversation } from '@/renderer/contexts/conversation';import { useWorkspace } from '@/renderer/contexts/workspace';-import { compareString } from '@colanode/core';import { useQueries } from '@/renderer/hooks/use-queries';import { MessageListQueryInput } from '@/shared/queries/message-list';-import { useConversation } from '@/renderer/contexts/conversation';const MESSAGES_PER_PAGE = 50;diff --git a/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx b/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsxindex 092b6c22..3bba1b9d 100644--- a/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx+++ b/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx@@ -1,11 +1,12 @@+import { SmilePlus } from 'lucide-react';import React from 'react';++import { EmojiPicker } from '@/renderer/components/emojis/emoji-picker';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { EmojiPicker } from '@/renderer/components/emojis/emoji-picker';-import { SmilePlus } from 'lucide-react';interface MessageReactionProps {onReactionClick: (reaction: string) => void;diff --git a/apps/desktop/src/renderer/components/messages/message-reactions.tsx b/apps/desktop/src/renderer/components/messages/message-reactions.tsxindex 370c4282..470ef2d7 100644--- a/apps/desktop/src/renderer/components/messages/message-reactions.tsx+++ b/apps/desktop/src/renderer/components/messages/message-reactions.tsx@@ -1,8 +1,9 @@import { MessageNode } from '@colanode/core';+import { EmojiElement } from '@/renderer/components/emojis/emoji-element';-import { cn } from '@/shared/lib/utils';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';+import { cn } from '@/shared/lib/utils';interface MessageReactionsProps {message: MessageNode;diff --git a/apps/desktop/src/renderer/components/messages/message-reference.tsx b/apps/desktop/src/renderer/components/messages/message-reference.tsxindex b0db9da6..b8dbb4d9 100644--- a/apps/desktop/src/renderer/components/messages/message-reference.tsx+++ b/apps/desktop/src/renderer/components/messages/message-reference.tsx@@ -1,9 +1,10 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';import { MessageNode } from '@colanode/core';+import { MessageAuthorAvatar } from '@/renderer/components/messages/message-author-avatar';-import { MessageContent } from '@/renderer/components/messages/message-content';import { MessageAuthorName } from '@/renderer/components/messages/message-author-name';+import { MessageContent } from '@/renderer/components/messages/message-content';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface MessageReferenceProps {messageId: string;diff --git a/apps/desktop/src/renderer/components/messages/message-reply-banner.tsx b/apps/desktop/src/renderer/components/messages/message-reply-banner.tsxindex 57abd055..219e6fcf 100644--- a/apps/desktop/src/renderer/components/messages/message-reply-banner.tsx+++ b/apps/desktop/src/renderer/components/messages/message-reply-banner.tsx@@ -1,8 +1,9 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';import { MessageNode } from '@colanode/core';import { CircleX } from 'lucide-react';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';+interface MessageReplyBannerProps {message: MessageNode;onCancel: () => void;diff --git a/apps/desktop/src/renderer/components/messages/message-time.tsx b/apps/desktop/src/renderer/components/messages/message-time.tsxindex 8cfdfc89..3eaeea33 100644--- a/apps/desktop/src/renderer/components/messages/message-time.tsx+++ b/apps/desktop/src/renderer/components/messages/message-time.tsx@@ -1,4 +1,5 @@-import { MessageNode, formatDate, timeAgo } from '@colanode/core';+import { formatDate, MessageNode, timeAgo } from '@colanode/core';+import {Tooltip,TooltipContent,diff --git a/apps/desktop/src/renderer/components/messages/message.tsx b/apps/desktop/src/renderer/components/messages/message.tsxindex e3cd3e39..3bba594f 100644--- a/apps/desktop/src/renderer/components/messages/message.tsx+++ b/apps/desktop/src/renderer/components/messages/message.tsx@@ -1,14 +1,15 @@-import { InView } from 'react-intersection-observer';import { MessageNode } from '@colanode/core';-import { MessageReactions } from '@/renderer/components/messages/message-reactions';-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useRadar } from '@/renderer/contexts/radar';+import { InView } from 'react-intersection-observer';+import { MessageActions } from '@/renderer/components/messages/message-actions';import { MessageAuthorAvatar } from '@/renderer/components/messages/message-author-avatar';import { MessageAuthorName } from '@/renderer/components/messages/message-author-name';import { MessageContent } from '@/renderer/components/messages/message-content';+import { MessageReactions } from '@/renderer/components/messages/message-reactions';import { MessageReference } from '@/renderer/components/messages/message-reference';import { MessageTime } from '@/renderer/components/messages/message-time';+import { useRadar } from '@/renderer/contexts/radar';+import { useWorkspace } from '@/renderer/contexts/workspace';interface MessageProps {message: MessageNode;diff --git a/apps/desktop/src/renderer/components/pages/page-body.tsx b/apps/desktop/src/renderer/components/pages/page-body.tsxindex 564d7e7d..bf54f5f0 100644--- a/apps/desktop/src/renderer/components/pages/page-body.tsx+++ b/apps/desktop/src/renderer/components/pages/page-body.tsx@@ -1,6 +1,7 @@import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';-import { ScrollArea } from '@/renderer/components/ui/scroll-area';+import { Document } from '@/renderer/components/documents/document';+import { ScrollArea } from '@/renderer/components/ui/scroll-area';interface PageBodyProps {page: PageNode;diff --git a/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsxindex 1388ad40..f16cdc01 100644--- a/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx@@ -1,4 +1,5 @@import { PageNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';interface PageBreadcrumbItemProps {diff --git a/apps/desktop/src/renderer/components/pages/page-container.tsx b/apps/desktop/src/renderer/components/pages/page-container.tsxindex bc15266c..6c08db3b 100644--- a/apps/desktop/src/renderer/components/pages/page-container.tsx+++ b/apps/desktop/src/renderer/components/pages/page-container.tsx@@ -1,8 +1,9 @@-import { useWorkspace } from '@/renderer/contexts/workspace';-import { useQuery } from '@/renderer/hooks/use-query';import { extractNodeRole } from '@colanode/core';-import { PageHeader } from '@/renderer/components/pages/page-header';+import { PageBody } from '@/renderer/components/pages/page-body';+import { PageHeader } from '@/renderer/components/pages/page-header';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface PageContainerProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-create-dialog.tsxindex 3e7688b1..3ab901bc 100644--- a/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx@@ -1,4 +1,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { generateId,IdType } from '@colanode/core';++import { PageForm } from '@/renderer/components/pages/page-form';import {Dialog,DialogContent,@@ -6,9 +8,8 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { IdType, generateId } from '@colanode/core';-import { PageForm } from '@/renderer/components/pages/page-form';interface PageCreateDialogProps {spaceId: string;diff --git a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsxindex 20311f98..26c9ea54 100644--- a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx@@ -8,8 +8,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface PageDeleteDialogProps {open: boolean;diff --git a/apps/desktop/src/renderer/components/pages/page-form.tsx b/apps/desktop/src/renderer/components/pages/page-form.tsxindex f9fdc9b6..af5ea991 100644--- a/apps/desktop/src/renderer/components/pages/page-form.tsx+++ b/apps/desktop/src/renderer/components/pages/page-form.tsx@@ -1,4 +1,10 @@+import { zodResolver } from '@hookform/resolvers/zod';+import { useForm } from 'react-hook-form';import { z } from 'zod';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Button } from '@/renderer/components/ui/button';import {Form,FormControl,@@ -6,13 +12,8 @@ import {FormItem,FormMessage,} from '@/renderer/components/ui/form';-import { Button } from '@/renderer/components/ui/button';-import { Spinner } from '@/renderer/components/ui/spinner';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';import { Input } from '@/renderer/components/ui/input';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Spinner } from '@/renderer/components/ui/spinner';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),diff --git a/apps/desktop/src/renderer/components/pages/page-header.tsx b/apps/desktop/src/renderer/components/pages/page-header.tsxindex 7385689e..c72237e2 100644--- a/apps/desktop/src/renderer/components/pages/page-header.tsx+++ b/apps/desktop/src/renderer/components/pages/page-header.tsx@@ -1,10 +1,11 @@+import { Node, NodeRole,PageNode } from '@colanode/core';+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';-import { PageNode, Node, NodeRole } from '@colanode/core';-import { Header } from '@/renderer/components/ui/header';import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';+import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';import { PageSettings } from '@/renderer/components/pages/page-settings';+import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';interface PageHeaderProps {nodes: Node[];diff --git a/apps/desktop/src/renderer/components/pages/page-settings.tsx b/apps/desktop/src/renderer/components/pages/page-settings.tsxindex 464b8b7a..2ea74cbc 100644--- a/apps/desktop/src/renderer/components/pages/page-settings.tsx+++ b/apps/desktop/src/renderer/components/pages/page-settings.tsx@@ -1,4 +1,10 @@+import { hasEditorAccess, NodeRole, PageNode } 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 { PageDeleteDialog } from '@/renderer/components/pages/page-delete-dialog';+import { PageUpdateDialog } from '@/renderer/components/pages/page-update-dialog';import {DropdownMenu,DropdownMenuContent,@@ -7,11 +13,6 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Copy, Image, LetterText, Settings, Trash2 } from 'lucide-react';-import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';-import { PageUpdateDialog } from '@/renderer/components/pages/page-update-dialog';-import { PageDeleteDialog } from '@/renderer/components/pages/page-delete-dialog';interface PageSettingsProps {page: PageNode;diff --git a/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx b/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsxindex 3d8f9533..87f6fb60 100644--- a/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx@@ -1,7 +1,8 @@-import { cn } from '@/shared/lib/utils';import { PageNode } 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;diff --git a/apps/desktop/src/renderer/components/pages/page-update-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-update-dialog.tsxindex d9abde84..48ed5153 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,6 @@-import { useWorkspace } from '@/renderer/contexts/workspace';+import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';++import { PageForm } from '@/renderer/components/pages/page-form';import {Dialog,DialogContent,@@ -6,10 +8,9 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';+import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';-import { hasEditorAccess, NodeRole, PageNode } from '@colanode/core';import { toast } from '@/renderer/hooks/use-toast';-import { PageForm } from '@/renderer/components/pages/page-form';interface PageUpdateDialogProps {page: PageNode;diff --git a/apps/desktop/src/renderer/components/records/record-attributes.tsx b/apps/desktop/src/renderer/components/records/record-attributes.tsxindex 14f2e1d3..63a09ace 100644--- a/apps/desktop/src/renderer/components/records/record-attributes.tsx+++ b/apps/desktop/src/renderer/components/records/record-attributes.tsx@@ -1,9 +1,10 @@import React from 'react';-import { RecordName } from '@/renderer/components/records/record-name';-import { useDatabase } from '@/renderer/contexts/database';++import { RecordAvatar } from '@/renderer/components/records/record-avatar';import { RecordField } from '@/renderer/components/records/record-field';import { RecordFieldValue } from '@/renderer/components/records/record-field-value';-import { RecordAvatar } from '@/renderer/components/records/record-avatar';+import { RecordName } from '@/renderer/components/records/record-name';+import { useDatabase } from '@/renderer/contexts/database';export const RecordAttributes = () => {const database = useDatabase();diff --git a/apps/desktop/src/renderer/components/records/record-avatar.tsx b/apps/desktop/src/renderer/components/records/record-avatar.tsxindex d062bbf2..23642c9a 100644--- a/apps/desktop/src/renderer/components/records/record-avatar.tsx+++ b/apps/desktop/src/renderer/components/records/record-avatar.tsx@@ -1,9 +1,9 @@-import { useRecord } from '@/renderer/contexts/record';-import { useMutation } from '@/renderer/hooks/use-mutation';-import { useWorkspace } from '@/renderer/contexts/workspace';+import { Avatar } from '@/renderer/components/avatars/avatar';import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';import { Button } from '@/renderer/components/ui/button';-import { Avatar } from '@/renderer/components/avatars/avatar';+import { useRecord } from '@/renderer/contexts/record';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';export const RecordAvatar = () => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/records/record-body.tsx b/apps/desktop/src/renderer/components/records/record-body.tsxindex b41c418b..d5d064e7 100644--- a/apps/desktop/src/renderer/components/records/record-body.tsx+++ b/apps/desktop/src/renderer/components/records/record-body.tsx@@ -1,15 +1,16 @@-import { Database } from '@/renderer/components/databases/database';-import { RecordAttributes } from '@/renderer/components/records/record-attributes';-import { ScrollArea } from '@/renderer/components/ui/scroll-area';-import { Document } from '@/renderer/components/documents/document';-import { Separator } from '@/renderer/components/ui/separator';-import { RecordProvider } from '@/renderer/components/records/record-provider';import {DatabaseNode,hasEditorAccess,NodeRole,RecordNode,} from '@colanode/core';++import { Database } from '@/renderer/components/databases/database';+import { Document } from '@/renderer/components/documents/document';+import { RecordAttributes } from '@/renderer/components/records/record-attributes';+import { RecordProvider } from '@/renderer/components/records/record-provider';+import { ScrollArea } from '@/renderer/components/ui/scroll-area';+import { Separator } from '@/renderer/components/ui/separator';import { useWorkspace } from '@/renderer/contexts/workspace';interface RecordBodyProps {diff --git a/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsxindex d87b0099..76f77791 100644--- a/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx@@ -1,4 +1,5 @@import { RecordNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';interface RecordBreadcrumbItemProps {diff --git a/apps/desktop/src/renderer/components/records/record-container.tsx b/apps/desktop/src/renderer/components/records/record-container.tsxindex 1f5102ef..03e4b60f 100644--- a/apps/desktop/src/renderer/components/records/record-container.tsx+++ b/apps/desktop/src/renderer/components/records/record-container.tsx@@ -1,8 +1,9 @@-import { useQuery } from '@/renderer/hooks/use-query';-import { useWorkspace } from '@/renderer/contexts/workspace';import { extractNodeRole } from '@colanode/core';-import { RecordHeader } from '@/renderer/components/records/record-header';+import { RecordBody } from '@/renderer/components/records/record-body';+import { RecordHeader } from '@/renderer/components/records/record-header';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';interface RecordContainerProps {nodeId: string;diff --git a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsxindex 09bae1ba..7fbbf13c 100644--- a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx+++ b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx@@ -8,8 +8,8 @@ import {AlertDialogTitle,} from '@/renderer/components/ui/alert-dialog';import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';interface RecordDeleteDialogProps {open: boolean;diff --git a/apps/desktop/src/renderer/components/records/record-field-value.tsx b/apps/desktop/src/renderer/components/records/record-field-value.tsxindex f5339e42..3f525dfc 100644--- a/apps/desktop/src/renderer/components/records/record-field-value.tsx+++ b/apps/desktop/src/renderer/components/records/record-field-value.tsx@@ -1,18 +1,19 @@import { FieldAttributes } from '@colanode/core';-import { RecordTextValue } from '@/renderer/components/records/values/record-text-value';-import { RecordNumberValue } from '@/renderer/components/records/values/record-number-value';+import { RecordBooleanValue } from '@/renderer/components/records/values/record-boolean-value';+import { RecordCollaboratorValue } from '@/renderer/components/records/values/record-collaborator-value';import { RecordCreatedAtValue } from '@/renderer/components/records/values/record-created-at-value';import { RecordCreatedByValue } from '@/renderer/components/records/values/record-created-by-value';-import { RecordSelectValue } from '@/renderer/components/records/values/record-select-value';-import { RecordPhoneValue } from '@/renderer/components/records/values/record-phone-value';+import { RecordDateValue } from '@/renderer/components/records/values/record-date-value';import { RecordEmailValue } from '@/renderer/components/records/values/record-email-value';-import { RecordUrlValue } from '@/renderer/components/records/values/record-url-value';import { RecordMultiSelectValue } from '@/renderer/components/records/values/record-multi-select-value';-import { RecordDateValue } from '@/renderer/components/records/values/record-date-value';-import { RecordCollaboratorValue } from '@/renderer/components/records/values/record-collaborator-value';+import { RecordNumberValue } from '@/renderer/components/records/values/record-number-value';+import { RecordPhoneValue } from '@/renderer/components/records/values/record-phone-value';+import { RecordSelectValue } from '@/renderer/components/records/values/record-select-value';+import { RecordTextValue } from '@/renderer/components/records/values/record-text-value';import { RecordUpdatedAtValue } from '@/renderer/components/records/values/record-updated-at-value';import { RecordUpdatedByValue } from '@/renderer/components/records/values/record-updated-by-value';+import { RecordUrlValue } from '@/renderer/components/records/values/record-url-value';interface RecordFieldValueProps {field: FieldAttributes;diff --git a/apps/desktop/src/renderer/components/records/record-field.tsx b/apps/desktop/src/renderer/components/records/record-field.tsxindex b079d195..9ddafd9b 100644--- a/apps/desktop/src/renderer/components/records/record-field.tsx+++ b/apps/desktop/src/renderer/components/records/record-field.tsx@@ -1,15 +1,16 @@-import React from 'react';import { FieldAttributes } from '@colanode/core';+import { Trash2 } from 'lucide-react';+import React from 'react';++import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';+import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';+import { FieldRenameInput } from '@/renderer/components/databases/fields/field-rename-input';import {Popover,PopoverContent,PopoverTrigger,} from '@/renderer/components/ui/popover';-import { FieldRenameInput } from '@/renderer/components/databases/fields/field-rename-input';import { Separator } from '@/renderer/components/ui/separator';-import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';-import { FieldIcon } from '@/renderer/components/databases/fields/field-icon';-import { Trash2 } from 'lucide-react';import { useDatabase } from '@/renderer/contexts/database';interface RecordFieldProps {diff --git a/apps/desktop/src/renderer/components/records/record-header.tsx b/apps/desktop/src/renderer/components/records/record-header.tsxindex 8771d168..57fff471 100644--- a/apps/desktop/src/renderer/components/records/record-header.tsx+++ b/apps/desktop/src/renderer/components/records/record-header.tsx@@ -1,10 +1,11 @@+import { Node, NodeRole,RecordNode } from '@colanode/core';+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';-import { RecordNode, Node, NodeRole } from '@colanode/core';-import { Header } from '@/renderer/components/ui/header';import { NodeBreadcrumb } from '@/renderer/components/layouts/node-breadcrumb';+import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';import { RecordSettings } from '@/renderer/components/records/record-settings';+import { Header } from '@/renderer/components/ui/header';import { useContainer } from '@/renderer/contexts/container';-import { NodeFullscreenButton } from '@/renderer/components/layouts/node-fullscreen-button';interface RecordHeaderProps {nodes: Node[];diff --git a/apps/desktop/src/renderer/components/records/record-name.tsx b/apps/desktop/src/renderer/components/records/record-name.tsxindex 19545297..5b499711 100644--- a/apps/desktop/src/renderer/components/records/record-name.tsx+++ b/apps/desktop/src/renderer/components/records/record-name.tsx@@ -1,7 +1,7 @@-import { useMutation } from '@/renderer/hooks/use-mutation';import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { useWorkspace } from '@/renderer/contexts/workspace';import { useRecord } from '@/renderer/contexts/record';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';export const RecordName = () => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/records/record-provider.tsx b/apps/desktop/src/renderer/components/records/record-provider.tsxindex d165e444..7abde45a 100644--- a/apps/desktop/src/renderer/components/records/record-provider.tsx+++ b/apps/desktop/src/renderer/components/records/record-provider.tsx@@ -1,6 +1,7 @@+import { hasEditorAccess, NodeRole, RecordNode } from '@colanode/core';import React from 'react';+import { RecordContext } from '@/renderer/contexts/record';-import { hasEditorAccess, NodeRole, RecordNode } from '@colanode/core';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';diff --git a/apps/desktop/src/renderer/components/records/record-settings.tsx b/apps/desktop/src/renderer/components/records/record-settings.tsxindex 6a351525..f2550220 100644--- a/apps/desktop/src/renderer/components/records/record-settings.tsx+++ b/apps/desktop/src/renderer/components/records/record-settings.tsx@@ -1,4 +1,9 @@+import { hasEditorAccess, NodeRole, RecordNode } from '@colanode/core';+import { Copy, Settings, Trash2 } from 'lucide-react';import React from 'react';++import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';+import { RecordDeleteDialog } from '@/renderer/components/records/record-delete-dialog';import {DropdownMenu,DropdownMenuContent,@@ -7,11 +12,7 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Copy, Settings, Trash2 } from 'lucide-react';-import { hasEditorAccess, NodeRole, RecordNode } from '@colanode/core';-import { NodeCollaboratorAudit } from '@/renderer/components/collaborators/node-collaborator-audit';import { useWorkspace } from '@/renderer/contexts/workspace';-import { RecordDeleteDialog } from '@/renderer/components/records/record-delete-dialog';interface RecordSettingsProps {record: RecordNode;diff --git a/apps/desktop/src/renderer/components/records/values/record-boolean-value.tsx b/apps/desktop/src/renderer/components/records/values/record-boolean-value.tsxindex 66b47c91..0f8a9335 100644--- a/apps/desktop/src/renderer/components/records/values/record-boolean-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-boolean-value.tsx@@ -1,6 +1,7 @@+import { BooleanFieldAttributes } from '@colanode/core';import React from 'react';+import { Checkbox } from '@/renderer/components/ui/checkbox';-import { BooleanFieldAttributes } from '@colanode/core';import { useRecord } from '@/renderer/contexts/record';interface RecordBooleanValueProps {diff --git a/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx b/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsxindex ae463151..2e57250a 100644--- a/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-collaborator-value.tsx@@ -1,18 +1,19 @@-import React from 'react';import { CollaboratorFieldAttributes, UserNode } from '@colanode/core';-import { useRecord } from '@/renderer/contexts/record';-import { useQueries } from '@/renderer/hooks/use-queries';-import { useWorkspace } from '@/renderer/contexts/workspace';+import { X } from 'lucide-react';+import React from 'react';+import { Avatar } from '@/renderer/components/avatars/avatar';+import { Badge } from '@/renderer/components/ui/badge';import {Popover,- PopoverTrigger,PopoverContent,+ PopoverTrigger,} from '@/renderer/components/ui/popover';-import { UserSearch } from '@/renderer/components/users/user-search';-import { Badge } from '@/renderer/components/ui/badge';import { Separator } from '@/renderer/components/ui/separator';-import { X } from 'lucide-react';+import { UserSearch } from '@/renderer/components/users/user-search';+import { useRecord } from '@/renderer/contexts/record';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQueries } from '@/renderer/hooks/use-queries';interface RecordCollaboratorValueProps {field: CollaboratorFieldAttributes;diff --git a/apps/desktop/src/renderer/components/records/values/record-created-at-value.tsx b/apps/desktop/src/renderer/components/records/values/record-created-at-value.tsxindex 2ced5790..f65065ab 100644--- a/apps/desktop/src/renderer/components/records/values/record-created-at-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-created-at-value.tsx@@ -1,4 +1,5 @@import { CreatedAtFieldAttributes } from '@colanode/core';+import { useRecord } from '@/renderer/contexts/record';interface RecordCreatedAtValueProps {diff --git a/apps/desktop/src/renderer/components/records/values/record-created-by-value.tsx b/apps/desktop/src/renderer/components/records/values/record-created-by-value.tsxindex 82d399ee..4256dbd5 100644--- a/apps/desktop/src/renderer/components/records/values/record-created-by-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-created-by-value.tsx@@ -1,8 +1,9 @@-import { Avatar } from '@/renderer/components/avatars/avatar';import { CreatedByFieldAttributes } from '@colanode/core';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { useRecord } from '@/renderer/contexts/record';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { useRecord } from '@/renderer/contexts/record';interface RecordCreatedByValueProps {field: CreatedByFieldAttributes;diff --git a/apps/desktop/src/renderer/components/records/values/record-date-value.tsx b/apps/desktop/src/renderer/components/records/values/record-date-value.tsxindex 99378093..54213625 100644--- a/apps/desktop/src/renderer/components/records/values/record-date-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-date-value.tsx@@ -1,4 +1,5 @@import { DateFieldAttributes } from '@colanode/core';+import { DatePicker } from '@/renderer/components/ui/date-picker';import { useRecord } from '@/renderer/contexts/record';diff --git a/apps/desktop/src/renderer/components/records/values/record-email-value.tsx b/apps/desktop/src/renderer/components/records/values/record-email-value.tsxindex 0229d31f..9bdc8cb6 100644--- a/apps/desktop/src/renderer/components/records/values/record-email-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-email-value.tsx@@ -1,4 +1,5 @@import { EmailFieldAttributes } from '@colanode/core';+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useRecord } from '@/renderer/contexts/record';diff --git a/apps/desktop/src/renderer/components/records/values/record-multi-select-value.tsx b/apps/desktop/src/renderer/components/records/values/record-multi-select-value.tsxindex 9e65be20..98c9a63a 100644--- a/apps/desktop/src/renderer/components/records/values/record-multi-select-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-multi-select-value.tsx@@ -1,12 +1,13 @@-import React from 'react';import { MultiSelectFieldAttributes } from '@colanode/core';+import React from 'react';++import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';import {Popover,- PopoverTrigger,PopoverContent,+ PopoverTrigger,} from '@/renderer/components/ui/popover';-import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';-import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';import { useRecord } from '@/renderer/contexts/record';interface RecordMultiSelectValueProps {diff --git a/apps/desktop/src/renderer/components/records/values/record-number-value.tsx b/apps/desktop/src/renderer/components/records/values/record-number-value.tsxindex a097640b..23337895 100644--- a/apps/desktop/src/renderer/components/records/values/record-number-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-number-value.tsx@@ -1,4 +1,5 @@import { type NumberFieldAttributes } from '@colanode/core';+import { SmartNumberInput } from '@/renderer/components/ui/smart-number-input';import { useRecord } from '@/renderer/contexts/record';diff --git a/apps/desktop/src/renderer/components/records/values/record-phone-value.tsx b/apps/desktop/src/renderer/components/records/values/record-phone-value.tsxindex 475e9f16..2b3b2819 100644--- a/apps/desktop/src/renderer/components/records/values/record-phone-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-phone-value.tsx@@ -1,4 +1,5 @@import { PhoneFieldAttributes } from '@colanode/core';+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useRecord } from '@/renderer/contexts/record';diff --git a/apps/desktop/src/renderer/components/records/values/record-select-value.tsx b/apps/desktop/src/renderer/components/records/values/record-select-value.tsxindex 9bf0af46..844bd64b 100644--- a/apps/desktop/src/renderer/components/records/values/record-select-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-select-value.tsx@@ -1,12 +1,13 @@-import React from 'react';import { SelectFieldAttributes } from '@colanode/core';+import React from 'react';++import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';import {Popover,- PopoverTrigger,PopoverContent,+ PopoverTrigger,} from '@/renderer/components/ui/popover';-import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';import { useRecord } from '@/renderer/contexts/record';interface RecordSelectValueProps {diff --git a/apps/desktop/src/renderer/components/records/values/record-text-value.tsx b/apps/desktop/src/renderer/components/records/values/record-text-value.tsxindex 61b73d65..115c9a06 100644--- a/apps/desktop/src/renderer/components/records/values/record-text-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-text-value.tsx@@ -1,4 +1,5 @@import { TextFieldAttributes } from '@colanode/core';+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';import { useRecord } from '@/renderer/contexts/record';diff --git a/apps/desktop/src/renderer/components/records/values/record-updated-at-value.tsx b/apps/desktop/src/renderer/components/records/values/record-updated-at-value.tsxindex 646d1cfe..903a5014 100644--- a/apps/desktop/src/renderer/components/records/values/record-updated-at-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-updated-at-value.tsx@@ -1,4 +1,5 @@import { UpdatedAtFieldAttributes } from '@colanode/core';+import { useRecord } from '@/renderer/contexts/record';interface RecordUpdatedAtValueProps {diff --git a/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsx b/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsxindex de6511f6..31b25a2f 100644--- a/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsx@@ -1,9 +1,10 @@+import { UpdatedByFieldAttributes } from '@colanode/core';import React from 'react';+import { Avatar } from '@/renderer/components/avatars/avatar';-import { UpdatedByFieldAttributes } from '@colanode/core';+import { useRecord } from '@/renderer/contexts/record';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { useRecord } from '@/renderer/contexts/record';interface RecordUpdatedByValueProps {field: UpdatedByFieldAttributes;diff --git a/apps/desktop/src/renderer/components/records/values/record-url-value.tsx b/apps/desktop/src/renderer/components/records/values/record-url-value.tsxindex 08c4de62..3640f8fe 100644--- a/apps/desktop/src/renderer/components/records/values/record-url-value.tsx+++ b/apps/desktop/src/renderer/components/records/values/record-url-value.tsx@@ -1,11 +1,12 @@-import { UrlFieldAttributes, isValidUrl } from '@colanode/core';+import { isValidUrl,UrlFieldAttributes } from '@colanode/core';+import { ExternalLink } from 'lucide-react';+import {HoverCard,HoverCardContent,HoverCardTrigger,} from '@/renderer/components/ui/hover-card';import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';-import { ExternalLink } from 'lucide-react';import { useRecord } from '@/renderer/contexts/record';import { cn } from '@/shared/lib/utils';diff --git a/apps/desktop/src/renderer/components/servers/server-create-dialog.tsx b/apps/desktop/src/renderer/components/servers/server-create-dialog.tsxindex 1f181e07..5d1561c5 100644--- a/apps/desktop/src/renderer/components/servers/server-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/servers/server-create-dialog.tsx@@ -1,4 +1,6 @@import React from 'react';++import { Button } from '@/renderer/components/ui/button';import {Dialog,DialogContent,@@ -7,12 +9,11 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';-import { Button } from '@/renderer/components/ui/button';-import { Label } from '@/renderer/components/ui/label';import { Input } from '@/renderer/components/ui/input';+import { Label } from '@/renderer/components/ui/label';import { Spinner } from '@/renderer/components/ui/spinner';-import { toast } from '@/renderer/hooks/use-toast';import { useMutation } from '@/renderer/hooks/use-mutation';+import { toast } from '@/renderer/hooks/use-toast';interface ServerCreateDialogProps {open: boolean;diff --git a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx b/apps/desktop/src/renderer/components/servers/server-dropdown.tsxindex 6e1e6bef..ce299b2e 100644--- a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx+++ b/apps/desktop/src/renderer/components/servers/server-dropdown.tsx@@ -1,15 +1,16 @@+import { DropdownMenuSeparator } from '@radix-ui/react-dropdown-menu';+import { ChevronDown } from 'lucide-react';import React from 'react';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { ServerCreateDialog } from '@/renderer/components/servers/server-create-dialog';import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { Avatar } from '@/renderer/components/avatars/avatar';import { Server } from '@/shared/types/servers';-import { ServerCreateDialog } from '@/renderer/components/servers/server-create-dialog';-import { DropdownMenuSeparator } from '@radix-ui/react-dropdown-menu';-import { ChevronDown } from 'lucide-react';interface ServerDropdownProps {value: Server;diff --git a/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsxindex 434456c8..a2d21b7e 100644--- a/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx@@ -1,4 +1,5 @@import { SpaceNode } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';interface SpaceBreadcrumbItemProps {diff --git a/apps/desktop/src/renderer/components/spaces/space-create-button.tsx b/apps/desktop/src/renderer/components/spaces/space-create-button.tsxindex 32ddf067..1dd1f31c 100644--- a/apps/desktop/src/renderer/components/spaces/space-create-button.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-create-button.tsx@@ -1,6 +1,7 @@+import { Plus } from 'lucide-react';import React from 'react';+import { SpaceCreateDialog } from '@/renderer/components/spaces/space-create-dialog';-import { Plus } from 'lucide-react';export const SpaceCreateButton = () => {const [open, setOpen] = React.useState(false);diff --git a/apps/desktop/src/renderer/components/spaces/space-create-dialog.tsx b/apps/desktop/src/renderer/components/spaces/space-create-dialog.tsxindex c04d5b53..f56393f4 100644--- a/apps/desktop/src/renderer/components/spaces/space-create-dialog.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-create-dialog.tsx@@ -1,3 +1,8 @@+import { zodResolver } from '@hookform/resolvers/zod';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { Button } from '@/renderer/components/ui/button';import {Dialog,DialogContent,@@ -6,7 +11,6 @@ import {DialogHeader,DialogTitle,} from '@/renderer/components/ui/dialog';-import { z } from 'zod';import {Form,FormControl,@@ -16,13 +20,10 @@ import {FormMessage,} from '@/renderer/components/ui/form';import { Input } from '@/renderer/components/ui/input';-import { Textarea } from '@/renderer/components/ui/textarea';-import { Button } from '@/renderer/components/ui/button';import { Spinner } from '@/renderer/components/ui/spinner';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';-import { useMutation } from '@/renderer/hooks/use-mutation';+import { Textarea } from '@/renderer/components/ui/textarea';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),diff --git a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsxindex af9f319e..a60e4b57 100644--- a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx@@ -1,3 +1,11 @@+import { extractNodeRole, hasAdminAccess, SpaceNode } 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 { SpaceDeleteForm } from '@/renderer/components/spaces/space-delete-form';+import { SpaceUpdateForm } from '@/renderer/components/spaces/space-update-form';import {Dialog,DialogContent,@@ -9,13 +17,6 @@ import {TabsList,TabsTrigger,} from '@/renderer/components/ui/tabs';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { SpaceUpdateForm } from '@/renderer/components/spaces/space-update-form';-import { SpaceDeleteForm } from '@/renderer/components/spaces/space-delete-form';-import { Info, Trash2, Users } from 'lucide-react';-import { VisuallyHidden } from '@radix-ui/react-visually-hidden';-import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';-import { extractNodeRole, hasAdminAccess, SpaceNode } from '@colanode/core';import { useWorkspace } from '@/renderer/contexts/workspace';interface SpaceSettingsDialogProps {diff --git a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsxindex 101b0b92..4e0132ed 100644--- a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx+++ b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx@@ -1,23 +1,36 @@+import { compareString,SpaceNode } from '@colanode/core';+import {+ ChevronRight,+ Database,+ Ellipsis,+ Folder,+ MessageCircle,+ Plus,+ Settings,+ StickyNote,+} from 'lucide-react';import React from 'react';-import { SpaceNode, compareString } from '@colanode/core';+import { Avatar } from '@/renderer/components/avatars/avatar';-import {- DropdownMenu,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuLabel,- DropdownMenuSeparator,- DropdownMenuTrigger,-} from '@/renderer/components/ui/dropdown-menu';import { ChannelCreateDialog } from '@/renderer/components/channels/channel-create-dialog';-import { PageCreateDialog } from '@/renderer/components/pages/page-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 { PageCreateDialog } from '@/renderer/components/pages/page-create-dialog';+import { SpaceSettingsDialog } from '@/renderer/components/spaces/space-settings-dialog';import {Collapsible,CollapsibleContent,CollapsibleTrigger,} from '@/renderer/components/ui/collapsible';+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuLabel,+ DropdownMenuSeparator,+ DropdownMenuTrigger,+} from '@/renderer/components/ui/dropdown-menu';import {SidebarMenuAction,SidebarMenuButton,@@ -27,18 +40,6 @@ import {SidebarMenuSubItem,} from '@/renderer/components/ui/sidebar';import { useWorkspace } from '@/renderer/contexts/workspace';-import { FolderCreateDialog } from '@/renderer/components/folders/folder-create-dialog';-import { SpaceSettingsDialog } from '@/renderer/components/spaces/space-settings-dialog';-import {- Ellipsis,- MessageCircle,- StickyNote,- Database,- Folder,- Settings,- Plus,- ChevronRight,-} from 'lucide-react';import { useQuery } from '@/renderer/hooks/use-query';interface SettingsState {diff --git a/apps/desktop/src/renderer/components/spaces/space-update-form.tsx b/apps/desktop/src/renderer/components/spaces/space-update-form.tsxindex b89efe27..027c7002 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,11 @@+import { SpaceNode } from '@colanode/core';+import { zodResolver } from '@hookform/resolvers/zod';+import { useForm } from 'react-hook-form';import * as z from 'zod';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';+import { Button } from '@/renderer/components/ui/button';import {Form,FormControl,@@ -9,16 +16,10 @@ import {} from '@/renderer/components/ui/form';import { Input } from '@/renderer/components/ui/input';import { Spinner } from '@/renderer/components/ui/spinner';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';+import { Textarea } from '@/renderer/components/ui/textarea';import { useWorkspace } from '@/renderer/contexts/workspace';import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { Textarea } from '@/renderer/components/ui/textarea';-import { Button } from '@/renderer/components/ui/button';-import { SpaceNode } from '@colanode/core';interface SpaceUpdateFormProps {space: SpaceNode;diff --git a/apps/desktop/src/renderer/components/ui/alert-dialog.tsx b/apps/desktop/src/renderer/components/ui/alert-dialog.tsxindex ce0b7e7a..0e9a5964 100644--- a/apps/desktop/src/renderer/components/ui/alert-dialog.tsx+++ b/apps/desktop/src/renderer/components/ui/alert-dialog.tsx@@ -1,8 +1,8 @@-import * as React from 'react';import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';+import * as React from 'react';-import { cn } from '@/shared/lib/utils';import { buttonVariants } from '@/renderer/components/ui/button';+import { cn } from '@/shared/lib/utils';const AlertDialog = AlertDialogPrimitive.Root;@@ -126,14 +126,14 @@ AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName;export {AlertDialog,- AlertDialogPortal,- AlertDialogOverlay,- AlertDialogTrigger,+ AlertDialogAction,+ AlertDialogCancel,AlertDialogContent,- AlertDialogHeader,+ AlertDialogDescription,AlertDialogFooter,+ AlertDialogHeader,+ AlertDialogOverlay,+ AlertDialogPortal,AlertDialogTitle,- AlertDialogDescription,- AlertDialogAction,- AlertDialogCancel,+ AlertDialogTrigger,};diff --git a/apps/desktop/src/renderer/components/ui/badge.tsx b/apps/desktop/src/renderer/components/ui/badge.tsxindex 1471bf15..7feabd31 100644--- a/apps/desktop/src/renderer/components/ui/badge.tsx+++ b/apps/desktop/src/renderer/components/ui/badge.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import { cva, type VariantProps } from 'class-variance-authority';+import * as React from 'react';import { cn } from '@/shared/lib/utils';diff --git a/apps/desktop/src/renderer/components/ui/breadcrumb.tsx b/apps/desktop/src/renderer/components/ui/breadcrumb.tsxindex 1e40445f..6ee40f72 100644--- a/apps/desktop/src/renderer/components/ui/breadcrumb.tsx+++ b/apps/desktop/src/renderer/components/ui/breadcrumb.tsx@@ -1,6 +1,6 @@-import * as React from 'react';import { ChevronRightIcon, DotsHorizontalIcon } from '@radix-ui/react-icons';import { Slot } from '@radix-ui/react-slot';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -106,10 +106,10 @@ BreadcrumbEllipsis.displayName = 'BreadcrumbElipssis';export {Breadcrumb,- BreadcrumbList,+ BreadcrumbEllipsis,BreadcrumbItem,BreadcrumbLink,+ BreadcrumbList,BreadcrumbPage,BreadcrumbSeparator,- BreadcrumbEllipsis,};diff --git a/apps/desktop/src/renderer/components/ui/button.tsx b/apps/desktop/src/renderer/components/ui/button.tsxindex 0c1b9f2b..450d62db 100644--- a/apps/desktop/src/renderer/components/ui/button.tsx+++ b/apps/desktop/src/renderer/components/ui/button.tsx@@ -1,6 +1,6 @@-import * as React from 'react';import { Slot } from '@radix-ui/react-slot';import { cva, type VariantProps } from 'class-variance-authority';+import * as React from 'react';import { cn } from '@/shared/lib/utils';diff --git a/apps/desktop/src/renderer/components/ui/calendar.tsx b/apps/desktop/src/renderer/components/ui/calendar.tsxindex 7dc0d312..80a6c1e9 100644--- a/apps/desktop/src/renderer/components/ui/calendar.tsx+++ b/apps/desktop/src/renderer/components/ui/calendar.tsx@@ -1,9 +1,9 @@-import * as React from 'react';import { ChevronLeftIcon, ChevronRightIcon } from '@radix-ui/react-icons';+import * as React from 'react';import { DayPicker } from 'react-day-picker';-import { cn } from '@/shared/lib/utils';import { buttonVariants } from '@/renderer/components/ui/button';+import { cn } from '@/shared/lib/utils';export type CalendarProps = React.ComponentProps<typeof DayPicker>;diff --git a/apps/desktop/src/renderer/components/ui/checkbox.tsx b/apps/desktop/src/renderer/components/ui/checkbox.tsxindex 5123e36f..e223a272 100644--- a/apps/desktop/src/renderer/components/ui/checkbox.tsx+++ b/apps/desktop/src/renderer/components/ui/checkbox.tsx@@ -1,6 +1,6 @@-import * as React from 'react';import * as CheckboxPrimitive from '@radix-ui/react-checkbox';import { CheckIcon } from '@radix-ui/react-icons';+import * as React from 'react';import { cn } from '@/shared/lib/utils';diff --git a/apps/desktop/src/renderer/components/ui/collapsible.tsx b/apps/desktop/src/renderer/components/ui/collapsible.tsxindex 9605c4e4..bb4bce6e 100644--- a/apps/desktop/src/renderer/components/ui/collapsible.tsx+++ b/apps/desktop/src/renderer/components/ui/collapsible.tsx@@ -6,4 +6,4 @@ const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;-export { Collapsible, CollapsibleTrigger, CollapsibleContent };+export { Collapsible, CollapsibleContent,CollapsibleTrigger };diff --git a/apps/desktop/src/renderer/components/ui/command.tsx b/apps/desktop/src/renderer/components/ui/command.tsxindex 406d4eab..e98670ea 100644--- a/apps/desktop/src/renderer/components/ui/command.tsx+++ b/apps/desktop/src/renderer/components/ui/command.tsx@@ -1,10 +1,10 @@-import * as React from 'react';import { type DialogProps } from '@radix-ui/react-dialog';import { MagnifyingGlassIcon } from '@radix-ui/react-icons';import { Command as CommandPrimitive } from 'cmdk';+import * as React from 'react';-import { cn } from '@/shared/lib/utils';import { Dialog, DialogContent } from '@/renderer/components/ui/dialog';+import { cn } from '@/shared/lib/utils';const Command = React.forwardRef<React.ElementRef<typeof CommandPrimitive>,@@ -141,11 +141,11 @@ CommandShortcut.displayName = 'CommandShortcut';export {Command,CommandDialog,- CommandInput,- CommandList,CommandEmpty,CommandGroup,+ CommandInput,CommandItem,- CommandShortcut,+ CommandList,CommandSeparator,+ CommandShortcut,};diff --git a/apps/desktop/src/renderer/components/ui/context-menu.tsx b/apps/desktop/src/renderer/components/ui/context-menu.tsxindex d6b8c229..8ad83891 100644--- a/apps/desktop/src/renderer/components/ui/context-menu.tsx+++ b/apps/desktop/src/renderer/components/ui/context-menu.tsx@@ -1,10 +1,10 @@-import * as React from 'react';import * as ContextMenuPrimitive from '@radix-ui/react-context-menu';import {CheckIcon,ChevronRightIcon,DotFilledIcon,} from '@radix-ui/react-icons';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -185,18 +185,18 @@ ContextMenuShortcut.displayName = 'ContextMenuShortcut';export {ContextMenu,- ContextMenuTrigger,+ ContextMenuCheckboxItem,ContextMenuContent,+ ContextMenuGroup,ContextMenuItem,- ContextMenuCheckboxItem,- ContextMenuRadioItem,ContextMenuLabel,+ ContextMenuPortal,+ ContextMenuRadioGroup,+ ContextMenuRadioItem,ContextMenuSeparator,ContextMenuShortcut,- ContextMenuGroup,- ContextMenuPortal,ContextMenuSub,ContextMenuSubContent,ContextMenuSubTrigger,- ContextMenuRadioGroup,+ ContextMenuTrigger,};diff --git a/apps/desktop/src/renderer/components/ui/date-picker.tsx b/apps/desktop/src/renderer/components/ui/date-picker.tsxindex 58c9c7bf..293a38ab 100644--- a/apps/desktop/src/renderer/components/ui/date-picker.tsx+++ b/apps/desktop/src/renderer/components/ui/date-picker.tsx@@ -1,4 +1,6 @@+import { toUTCDate } from '@colanode/core';import React from 'react';+import { Calendar } from '@/renderer/components/ui/calendar';import {Popover,@@ -6,7 +8,6 @@ import {PopoverTrigger,} from '@/renderer/components/ui/popover';import { cn } from '@/shared/lib/utils';-import { toUTCDate } from '@colanode/core';interface DatePickerProps {value: Date | null;diff --git a/apps/desktop/src/renderer/components/ui/dialog.tsx b/apps/desktop/src/renderer/components/ui/dialog.tsxindex e7ce8c23..0ab2e506 100644--- a/apps/desktop/src/renderer/components/ui/dialog.tsx+++ b/apps/desktop/src/renderer/components/ui/dialog.tsx@@ -1,6 +1,6 @@-import * as React from 'react';import * as DialogPrimitive from '@radix-ui/react-dialog';import { Cross2Icon } from '@radix-ui/react-icons';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -120,13 +120,13 @@ DialogDescription.displayName = DialogPrimitive.Description.displayName;export {Dialog,- DialogPortal,- DialogOverlay,- DialogTrigger,DialogClose,DialogContent,- DialogHeader,+ DialogDescription,DialogFooter,+ DialogHeader,+ DialogOverlay,+ DialogPortal,DialogTitle,- DialogDescription,+ DialogTrigger,};diff --git a/apps/desktop/src/renderer/components/ui/dropdown-menu.tsx b/apps/desktop/src/renderer/components/ui/dropdown-menu.tsxindex 3f2a4e23..73af9590 100644--- a/apps/desktop/src/renderer/components/ui/dropdown-menu.tsx+++ b/apps/desktop/src/renderer/components/ui/dropdown-menu.tsx@@ -1,10 +1,10 @@-import * as React from 'react';import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';import {CheckIcon,ChevronRightIcon,DotFilledIcon,} from '@radix-ui/react-icons';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -186,18 +186,18 @@ DropdownMenuShortcut.displayName = 'DropdownMenuShortcut';export {DropdownMenu,- DropdownMenuTrigger,+ DropdownMenuCheckboxItem,DropdownMenuContent,+ DropdownMenuGroup,DropdownMenuItem,- DropdownMenuCheckboxItem,- DropdownMenuRadioItem,DropdownMenuLabel,+ DropdownMenuPortal,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,DropdownMenuSeparator,DropdownMenuShortcut,- DropdownMenuGroup,- DropdownMenuPortal,DropdownMenuSub,DropdownMenuSubContent,DropdownMenuSubTrigger,- DropdownMenuRadioGroup,+ DropdownMenuTrigger,};diff --git a/apps/desktop/src/renderer/components/ui/dropzone.tsx b/apps/desktop/src/renderer/components/ui/dropzone.tsxindex 0f57d1fb..08c5adbe 100644--- a/apps/desktop/src/renderer/components/ui/dropzone.tsx+++ b/apps/desktop/src/renderer/components/ui/dropzone.tsx@@ -1,7 +1,7 @@+import { Upload } from 'lucide-react';import React from 'react';import { useDrop } from 'react-dnd';import { NativeTypes } from 'react-dnd-html5-backend';-import { Upload } from 'lucide-react';interface DropzoneProps {text: string;diff --git a/apps/desktop/src/renderer/components/ui/form.tsx b/apps/desktop/src/renderer/components/ui/form.tsxindex 315784bc..20a2d236 100644--- a/apps/desktop/src/renderer/components/ui/form.tsx+++ b/apps/desktop/src/renderer/components/ui/form.tsx@@ -1,6 +1,6 @@-import * as React from 'react';import * as LabelPrimitive from '@radix-ui/react-label';import { Slot } from '@radix-ui/react-slot';+import * as React from 'react';import {Controller,ControllerProps,@@ -10,8 +10,8 @@ import {useFormContext,} from 'react-hook-form';-import { cn } from '@/shared/lib/utils';import { Label } from '@/renderer/components/ui/label';+import { cn } from '@/shared/lib/utils';const Form = FormProvider;@@ -166,12 +166,12 @@ const FormMessage = React.forwardRef<FormMessage.displayName = 'FormMessage';export {- useFormField,Form,- FormItem,- FormLabel,FormControl,FormDescription,- FormMessage,FormField,+ FormItem,+ FormLabel,+ FormMessage,+ useFormField,};diff --git a/apps/desktop/src/renderer/components/ui/header.tsx b/apps/desktop/src/renderer/components/ui/header.tsxindex 1e032c29..6e1a0a08 100644--- a/apps/desktop/src/renderer/components/ui/header.tsx+++ b/apps/desktop/src/renderer/components/ui/header.tsx@@ -1,4 +1,5 @@import * as React from 'react';+import { cn } from '@/shared/lib/utils';const Header = React.forwardRef<diff --git a/apps/desktop/src/renderer/components/ui/hover-card.tsx b/apps/desktop/src/renderer/components/ui/hover-card.tsxindex 6d093f12..fff8e674 100644--- a/apps/desktop/src/renderer/components/ui/hover-card.tsx+++ b/apps/desktop/src/renderer/components/ui/hover-card.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import * as HoverCardPrimitive from '@radix-ui/react-hover-card';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -24,4 +24,4 @@ const HoverCardContent = React.forwardRef<));HoverCardContent.displayName = HoverCardPrimitive.Content.displayName;-export { HoverCard, HoverCardTrigger, HoverCardContent };+export { HoverCard, HoverCardContent,HoverCardTrigger };diff --git a/apps/desktop/src/renderer/components/ui/label.tsx b/apps/desktop/src/renderer/components/ui/label.tsxindex a472b78e..f40a7ea3 100644--- a/apps/desktop/src/renderer/components/ui/label.tsx+++ b/apps/desktop/src/renderer/components/ui/label.tsx@@ -1,6 +1,6 @@-import * as React from 'react';import * as LabelPrimitive from '@radix-ui/react-label';import { cva, type VariantProps } from 'class-variance-authority';+import * as React from 'react';import { cn } from '@/shared/lib/utils';diff --git a/apps/desktop/src/renderer/components/ui/popover.tsx b/apps/desktop/src/renderer/components/ui/popover.tsxindex 8dae36c9..f410d448 100644--- a/apps/desktop/src/renderer/components/ui/popover.tsx+++ b/apps/desktop/src/renderer/components/ui/popover.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import * as PopoverPrimitive from '@radix-ui/react-popover';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -28,4 +28,4 @@ const PopoverContent = React.forwardRef<));PopoverContent.displayName = PopoverPrimitive.Content.displayName;-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };+export { Popover, PopoverAnchor,PopoverContent, PopoverTrigger };diff --git a/apps/desktop/src/renderer/components/ui/scroll-area.tsx b/apps/desktop/src/renderer/components/ui/scroll-area.tsxindex 22360f10..4b12f98c 100644--- a/apps/desktop/src/renderer/components/ui/scroll-area.tsx+++ b/apps/desktop/src/renderer/components/ui/scroll-area.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import * as ScrollAreaPrimitive from '@radix-ui/react-scroll-area';+import * as React from 'react';import { cn } from '@/shared/lib/utils';diff --git a/apps/desktop/src/renderer/components/ui/separator.tsx b/apps/desktop/src/renderer/components/ui/separator.tsxindex acc64da5..d6006de4 100644--- a/apps/desktop/src/renderer/components/ui/separator.tsx+++ b/apps/desktop/src/renderer/components/ui/separator.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import * as SeparatorPrimitive from '@radix-ui/react-separator';+import * as React from 'react';import { cn } from '@/shared/lib/utils';diff --git a/apps/desktop/src/renderer/components/ui/sheet.tsx b/apps/desktop/src/renderer/components/ui/sheet.tsxindex 5cf93e84..91fa1079 100644--- a/apps/desktop/src/renderer/components/ui/sheet.tsx+++ b/apps/desktop/src/renderer/components/ui/sheet.tsx@@ -1,7 +1,7 @@-import * as React from 'react';import * as SheetPrimitive from '@radix-ui/react-dialog';import { Cross2Icon } from '@radix-ui/react-icons';import { cva, type VariantProps } from 'class-variance-authority';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -126,13 +126,13 @@ SheetDescription.displayName = SheetPrimitive.Description.displayName;export {Sheet,- SheetPortal,- SheetOverlay,- SheetTrigger,SheetClose,SheetContent,- SheetHeader,+ SheetDescription,SheetFooter,+ SheetHeader,+ SheetOverlay,+ SheetPortal,SheetTitle,- SheetDescription,+ SheetTrigger,};diff --git a/apps/desktop/src/renderer/components/ui/sidebar.tsx b/apps/desktop/src/renderer/components/ui/sidebar.tsxindex 17556a69..876ac13c 100644--- a/apps/desktop/src/renderer/components/ui/sidebar.tsx+++ b/apps/desktop/src/renderer/components/ui/sidebar.tsx@@ -1,8 +1,8 @@-import * as React from 'react';import { Slot } from '@radix-ui/react-slot';-import { VariantProps, cva } from 'class-variance-authority';+import { cva,VariantProps } from 'class-variance-authority';+import { PanelLeftClose, PanelLeftOpen } from 'lucide-react';+import * as React from 'react';-import { cn } from '@/shared/lib/utils';import { Button } from '@/renderer/components/ui/button';import { Input } from '@/renderer/components/ui/input';import { Separator } from '@/renderer/components/ui/separator';@@ -13,7 +13,7 @@ import {TooltipProvider,TooltipTrigger,} from '@/renderer/components/ui/tooltip';-import { PanelLeftClose, PanelLeftOpen } from 'lucide-react';+import { cn } from '@/shared/lib/utils';const SIDEBAR_WIDTH = '16rem';const SIDEBAR_WIDTH_ICON = '3rem';diff --git a/apps/desktop/src/renderer/components/ui/smart-number-input.tsx b/apps/desktop/src/renderer/components/ui/smart-number-input.tsxindex 2fff0959..0045d25f 100644--- a/apps/desktop/src/renderer/components/ui/smart-number-input.tsx+++ b/apps/desktop/src/renderer/components/ui/smart-number-input.tsx@@ -1,6 +1,7 @@+import debounce from 'lodash/debounce';import * as React from 'react';+import { cn } from '@/shared/lib/utils';-import debounce from 'lodash/debounce';interface SmartNumberInputProps {value: number | null;diff --git a/apps/desktop/src/renderer/components/ui/smart-text-input.tsx b/apps/desktop/src/renderer/components/ui/smart-text-input.tsxindex b091dc32..d044fa9e 100644--- a/apps/desktop/src/renderer/components/ui/smart-text-input.tsx+++ b/apps/desktop/src/renderer/components/ui/smart-text-input.tsx@@ -1,6 +1,7 @@+import debounce from 'lodash/debounce';import * as React from 'react';+import { cn } from '@/shared/lib/utils';-import debounce from 'lodash/debounce';interface SmartTextInputProps {value: string | null;diff --git a/apps/desktop/src/renderer/components/ui/spinner.tsx b/apps/desktop/src/renderer/components/ui/spinner.tsxindex e3d3fad6..71e65191 100644--- a/apps/desktop/src/renderer/components/ui/spinner.tsx+++ b/apps/desktop/src/renderer/components/ui/spinner.tsx@@ -1,7 +1,7 @@+import { LoaderCircle } from 'lucide-react';import * as React from 'react';import { cn } from '@/shared/lib/utils';-import { LoaderCircle } from 'lucide-react';export interface SpinnerProps {className?: string;diff --git a/apps/desktop/src/renderer/components/ui/tabs.tsx b/apps/desktop/src/renderer/components/ui/tabs.tsxindex 4fceca63..6116517c 100644--- a/apps/desktop/src/renderer/components/ui/tabs.tsx+++ b/apps/desktop/src/renderer/components/ui/tabs.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import * as TabsPrimitive from '@radix-ui/react-tabs';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -50,4 +50,4 @@ const TabsContent = React.forwardRef<));TabsContent.displayName = TabsPrimitive.Content.displayName;-export { Tabs, TabsList, TabsTrigger, TabsContent };+export { Tabs, TabsContent,TabsList, TabsTrigger };diff --git a/apps/desktop/src/renderer/components/ui/toast.tsx b/apps/desktop/src/renderer/components/ui/toast.tsxindex 2fd1814d..6f655d08 100644--- a/apps/desktop/src/renderer/components/ui/toast.tsx+++ b/apps/desktop/src/renderer/components/ui/toast.tsx@@ -1,7 +1,7 @@-import * as React from 'react';import { Cross2Icon } from '@radix-ui/react-icons';import * as ToastPrimitives from '@radix-ui/react-toast';import { cva, type VariantProps } from 'class-variance-authority';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -115,13 +115,13 @@ type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;type ToastActionElement = React.ReactElement<typeof ToastAction>;export {- type ToastProps,+ Toast,+ ToastAction,type ToastActionElement,+ ToastClose,+ ToastDescription,+ type ToastProps,ToastProvider,- ToastViewport,- Toast,ToastTitle,- ToastDescription,- ToastClose,- ToastAction,+ ToastViewport,};diff --git a/apps/desktop/src/renderer/components/ui/tooltip.tsx b/apps/desktop/src/renderer/components/ui/tooltip.tsxindex 9982c02c..b05b5887 100644--- a/apps/desktop/src/renderer/components/ui/tooltip.tsx+++ b/apps/desktop/src/renderer/components/ui/tooltip.tsx@@ -1,5 +1,5 @@-import * as React from 'react';import * as TooltipPrimitive from '@radix-ui/react-tooltip';+import * as React from 'react';import { cn } from '@/shared/lib/utils';@@ -25,4 +25,4 @@ const TooltipContent = React.forwardRef<));TooltipContent.displayName = TooltipPrimitive.Content.displayName;-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };+export { Tooltip, TooltipContent, TooltipProvider,TooltipTrigger };diff --git a/apps/desktop/src/renderer/components/users/user-search.tsx b/apps/desktop/src/renderer/components/users/user-search.tsxindex 5396be99..74d63957 100644--- a/apps/desktop/src/renderer/components/users/user-search.tsx+++ b/apps/desktop/src/renderer/components/users/user-search.tsx@@ -1,4 +1,7 @@+import { UserNode } from '@colanode/core';import React from 'react';++import { Avatar } from '@/renderer/components/avatars/avatar';import {Command,CommandEmpty,@@ -9,8 +12,6 @@ import {} from '@/renderer/components/ui/command';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { UserNode } from '@colanode/core';interface UserSearchProps {exclude?: string[];diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsxindex cacbc691..1126dea8 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-create.tsx@@ -1,9 +1,10 @@-import { toast } from '@/renderer/hooks/use-toast';-import { useMutation } from '@/renderer/hooks/use-mutation';-import { useAccount } from '@/renderer/contexts/account';import { useNavigate } from 'react-router-dom';+import { WorkspaceForm } from '@/renderer/components/workspaces/workspace-form';+import { useAccount } from '@/renderer/contexts/account';+import { useMutation } from '@/renderer/hooks/use-mutation';import { useQuery } from '@/renderer/hooks/use-query';+import { toast } from '@/renderer/hooks/use-toast';export const WorkspaceCreate = () => {const account = useAccount();diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-form.tsxindex cb7c6aae..5b18fa1c 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx@@ -1,26 +1,27 @@+import { generateId, IdType } from '@colanode/core';+import { zodResolver } from '@hookform/resolvers/zod';+import { Upload } from 'lucide-react';import React from 'react';+import { useForm } from 'react-hook-form';import { z } from 'zod';++import { Avatar } from '@/renderer/components/avatars/avatar';+import { Button } from '@/renderer/components/ui/button';import {Form,FormControl,FormField,FormItem,- FormMessage,FormLabel,+ FormMessage,} from '@/renderer/components/ui/form';-import { useForm } from 'react-hook-form';-import { zodResolver } from '@hookform/resolvers/zod';-import { Button } from '@/renderer/components/ui/button';-import { Spinner } from '@/renderer/components/ui/spinner';import { Input } from '@/renderer/components/ui/input';+import { Spinner } from '@/renderer/components/ui/spinner';import { Textarea } from '@/renderer/components/ui/textarea';-import { toast } from '@/renderer/hooks/use-toast';-import { useMutation } from '@/renderer/hooks/use-mutation';import { useAccount } from '@/renderer/contexts/account';-import { Avatar } from '@/renderer/components/avatars/avatar';-import { generateId, IdType } from '@colanode/core';+import { useMutation } from '@/renderer/hooks/use-mutation';+import { toast } from '@/renderer/hooks/use-toast';import { cn } from '@/shared/lib/utils';-import { Upload } from 'lucide-react';const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsxindex 10b8004b..dca4d17d 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx@@ -1,5 +1,6 @@import React from 'react';import { useNavigate } from 'react-router-dom';+import { useAccount } from '@/renderer/contexts/account';export const WorkspaceRedirect = (): React.ReactNode => {diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsxindex 9714a752..8670a792 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx@@ -1,4 +1,9 @@+import { VisuallyHidden } from '@radix-ui/react-visually-hidden';+import { Info, Trash2, Users } from 'lucide-react';import React from 'react';+import { match } from 'ts-pattern';++import { Avatar } from '@/renderer/components/avatars/avatar';import {Dialog,DialogContent,@@ -9,18 +14,14 @@ import {SidebarContent,SidebarGroup,SidebarGroupContent,+ SidebarHeader,SidebarMenu,SidebarMenuButton,SidebarMenuItem,SidebarProvider,- SidebarHeader,} from '@/renderer/components/ui/sidebar';-import { Avatar } from '@/renderer/components/avatars/avatar';import { WorkspaceUpdate } from '@/renderer/components/workspaces/workspace-update';import { WorkspaceUsers } from '@/renderer/components/workspaces/workspace-users';-import { VisuallyHidden } from '@radix-ui/react-visually-hidden';-import { Info, Trash2, Users } from 'lucide-react';-import { match } from 'ts-pattern';import { useWorkspace } from '@/renderer/contexts/workspace';interface WorkspaceSettingsDialogProps {diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-update.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-update.tsxindex e14c9088..6b47b348 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-update.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-update.tsx@@ -1,7 +1,7 @@-import { toast } from '@/renderer/hooks/use-toast';-import { useMutation } from '@/renderer/hooks/use-mutation';-import { WorkspaceForm } from './workspace-form';+import { WorkspaceForm } from '@/renderer/components/workspaces/workspace-form';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useMutation } from '@/renderer/hooks/use-mutation';+import { toast } from '@/renderer/hooks/use-toast';export const WorkspaceUpdate = () => {const workspace = useWorkspace();diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsxindex 42406c68..66795e31 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx@@ -1,10 +1,11 @@-import React from 'react';import { isValidEmail } from '@colanode/core';+import { X } from 'lucide-react';+import React from 'react';+import { Button } from '@/renderer/components/ui/button';-import { useMutation } from '@/renderer/hooks/use-mutation';import { Spinner } from '@/renderer/components/ui/spinner';+import { useMutation } from '@/renderer/hooks/use-mutation';import { toast } from '@/renderer/hooks/use-toast';-import { X } from 'lucide-react';import { Workspace } from '@/shared/types/workspaces';interface WorkspaceUserInviteProps {diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsxindex d97a127e..2a8821ed 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx@@ -1,15 +1,16 @@+import { WorkspaceRole } from '@colanode/core';+import { Check, ChevronDown } from 'lucide-react';+import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,DropdownMenuTrigger,} from '@/renderer/components/ui/dropdown-menu';-import { WorkspaceRole } from '@colanode/core';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';-import { Check, ChevronDown } from 'lucide-react';-import { useWorkspace } from '@/renderer/contexts/workspace';interface WorkspaceRoleItem {name: string;diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsxindex 737217e8..3a1a177d 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace-users.tsx@@ -1,14 +1,15 @@+import { WorkspaceRole } from '@colanode/core';import React from 'react';-import { useQueries } from '@/renderer/hooks/use-queries';-import { Separator } from '@/renderer/components/ui/separator';-import { WorkspaceUserInvite } from '@/renderer/components/workspaces/workspace-user-invite';+import { InView } from 'react-intersection-observer';+import { Avatar } from '@/renderer/components/avatars/avatar';+import { Separator } from '@/renderer/components/ui/separator';import { Spinner } from '@/renderer/components/ui/spinner';-import { InView } from 'react-intersection-observer';+import { WorkspaceUserInvite } from '@/renderer/components/workspaces/workspace-user-invite';import { WorkspaceUserRoleDropdown } from '@/renderer/components/workspaces/workspace-user-role-dropdown';-import { WorkspaceRole } from '@colanode/core';-import { WorkspaceUserListQueryInput } from '@/shared/queries/workspace-user-list';import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQueries } from '@/renderer/hooks/use-queries';+import { WorkspaceUserListQueryInput } from '@/shared/queries/workspace-user-list';const USERS_PER_PAGE = 50;diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsxindex e595e9cc..633ff463 100644--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx@@ -1,9 +1,10 @@import React from 'react';-import { WorkspaceContext } from '@/renderer/contexts/workspace';import { useParams, useSearchParams } from 'react-router-dom';-import { useAccount } from '@/renderer/contexts/account';+import { Layout } from '@/renderer/components/layouts/layout';import { WorkspaceSettingsDialog } from '@/renderer/components/workspaces/workspace-settings-dialog';+import { useAccount } from '@/renderer/contexts/account';+import { WorkspaceContext } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';export const Workspace = () => {diff --git a/apps/desktop/src/renderer/contexts/account.ts b/apps/desktop/src/renderer/contexts/account.tsindex fe225302..5b5ad915 100644--- a/apps/desktop/src/renderer/contexts/account.ts+++ b/apps/desktop/src/renderer/contexts/account.ts@@ -1,4 +1,5 @@import { createContext, useContext } from 'react';+import { Account } from '@/shared/types/accounts';interface AccountContext extends Account {diff --git a/apps/desktop/src/renderer/contexts/conversation.ts b/apps/desktop/src/renderer/contexts/conversation.tsindex 97c4e6c6..7df0e35c 100644--- a/apps/desktop/src/renderer/contexts/conversation.ts+++ b/apps/desktop/src/renderer/contexts/conversation.ts@@ -1,4 +1,4 @@-import { NodeRole, MessageNode } from '@colanode/core';+import { MessageNode,NodeRole } from '@colanode/core';import { createContext, useContext } from 'react';interface ConversationContext {diff --git a/apps/desktop/src/renderer/contexts/database.ts b/apps/desktop/src/renderer/contexts/database.tsindex 527a0884..c4b5ffaa 100644--- a/apps/desktop/src/renderer/contexts/database.ts+++ b/apps/desktop/src/renderer/contexts/database.ts@@ -1,11 +1,11 @@-import { createContext, useContext } from 'react';import {- ViewAttributes,FieldAttributes,FieldType,- SelectOptionAttributes,NodeRole,+ SelectOptionAttributes,+ ViewAttributes,} from '@colanode/core';+import { createContext, useContext } from 'react';interface DatabaseContext {id: string;diff --git a/apps/desktop/src/renderer/contexts/emoji-picker.ts b/apps/desktop/src/renderer/contexts/emoji-picker.tsindex 1d323c3e..4a5a8bf3 100644--- a/apps/desktop/src/renderer/contexts/emoji-picker.ts+++ b/apps/desktop/src/renderer/contexts/emoji-picker.ts@@ -1,6 +1,7 @@-import { EmojiData, Emoji } from '@/shared/types/emojis';import { createContext, useContext } from 'react';+import { Emoji,EmojiData } from '@/shared/types/emojis';+interface EmojiPickerContextProps {data: EmojiData;skinTone: number;diff --git a/apps/desktop/src/renderer/contexts/icon-picker.ts b/apps/desktop/src/renderer/contexts/icon-picker.tsindex 13e822f7..74f311c3 100644--- a/apps/desktop/src/renderer/contexts/icon-picker.ts+++ b/apps/desktop/src/renderer/contexts/icon-picker.ts@@ -1,6 +1,7 @@-import { IconData, Icon } from '@/shared/types/icons';import { createContext, useContext } from 'react';+import { Icon,IconData } from '@/shared/types/icons';+interface IconPickerContextProps {data: IconData;onPick: (icon: Icon) => void;diff --git a/apps/desktop/src/renderer/contexts/radar.ts b/apps/desktop/src/renderer/contexts/radar.tsindex 947118e7..b2a71b17 100644--- a/apps/desktop/src/renderer/contexts/radar.ts+++ b/apps/desktop/src/renderer/contexts/radar.ts@@ -1,10 +1,11 @@+import { createContext, useContext } from 'react';+import {AccountReadState,ChannelReadState,ChatReadState,WorkspaceReadState,} from '@/shared/types/radars';-import { createContext, useContext } from 'react';interface RadarContext {getAccountState: (accountId: string) => AccountReadState;diff --git a/apps/desktop/src/renderer/contexts/view.ts b/apps/desktop/src/renderer/contexts/view.tsindex 3ea56d78..c88e97eb 100644--- a/apps/desktop/src/renderer/contexts/view.ts+++ b/apps/desktop/src/renderer/contexts/view.ts@@ -4,9 +4,10 @@ import {ViewSortAttributes,ViewType,} from '@colanode/core';-import { ViewField } from '@/shared/types/databases';import { createContext, useContext } from 'react';+import { ViewField } from '@/shared/types/databases';+interface ViewContext {id: string;name: string;diff --git a/apps/desktop/src/renderer/contexts/workspace.ts b/apps/desktop/src/renderer/contexts/workspace.tsindex ba9d06b3..10387bdc 100644--- a/apps/desktop/src/renderer/contexts/workspace.ts+++ b/apps/desktop/src/renderer/contexts/workspace.ts@@ -1,4 +1,5 @@import { createContext, useContext } from 'react';+import { Workspace } from '@/shared/types/workspaces';interface WorkspaceContext extends Workspace {diff --git a/apps/desktop/src/renderer/editor/commands/blockquote.tsx b/apps/desktop/src/renderer/editor/commands/blockquote.tsxindex 9b61b1ce..dc5c9634 100644--- a/apps/desktop/src/renderer/editor/commands/blockquote.tsx+++ b/apps/desktop/src/renderer/editor/commands/blockquote.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { Quote } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const BlockquoteCommand: EditorCommand = {key: 'blockquote',name: 'Blockquote',diff --git a/apps/desktop/src/renderer/editor/commands/bullet-list.tsx b/apps/desktop/src/renderer/editor/commands/bullet-list.tsxindex c7f5ddc3..e7603ff0 100644--- a/apps/desktop/src/renderer/editor/commands/bullet-list.tsx+++ b/apps/desktop/src/renderer/editor/commands/bullet-list.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { List } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const BulletListCommand: EditorCommand = {key: 'bullet-list',name: 'Bullet List',diff --git a/apps/desktop/src/renderer/editor/commands/code-block.tsx b/apps/desktop/src/renderer/editor/commands/code-block.tsxindex fdd8cb86..25aa7bb2 100644--- a/apps/desktop/src/renderer/editor/commands/code-block.tsx+++ b/apps/desktop/src/renderer/editor/commands/code-block.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { Code } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const CodeBlockCommand: EditorCommand = {key: 'code-block',name: 'Code',diff --git a/apps/desktop/src/renderer/editor/commands/divider.tsx b/apps/desktop/src/renderer/editor/commands/divider.tsxindex 9af14b68..cb7f2514 100644--- a/apps/desktop/src/renderer/editor/commands/divider.tsx+++ b/apps/desktop/src/renderer/editor/commands/divider.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { SeparatorHorizontal } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const DividerCommand: EditorCommand = {key: 'divider',name: 'Divider',diff --git a/apps/desktop/src/renderer/editor/commands/file.tsx b/apps/desktop/src/renderer/editor/commands/file.tsxindex 1ad0e3b9..b408eba2 100644--- a/apps/desktop/src/renderer/editor/commands/file.tsx+++ b/apps/desktop/src/renderer/editor/commands/file.tsx@@ -1,7 +1,8 @@-import { EditorCommand } from '@/shared/types/editor';import { NodeTypes } from '@colanode/core';import { FilePlus } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const FileCommand: EditorCommand = {key: 'file',name: 'File',diff --git a/apps/desktop/src/renderer/editor/commands/folder.tsx b/apps/desktop/src/renderer/editor/commands/folder.tsxindex 02dd1964..4df6363a 100644--- a/apps/desktop/src/renderer/editor/commands/folder.tsx+++ b/apps/desktop/src/renderer/editor/commands/folder.tsx@@ -1,7 +1,8 @@-import { EditorCommand } from '@/shared/types/editor';import { NodeTypes } from '@colanode/core';import { Folder } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const FolderCommand: EditorCommand = {key: 'folder',name: 'Folder',diff --git a/apps/desktop/src/renderer/editor/commands/heading1.tsx b/apps/desktop/src/renderer/editor/commands/heading1.tsxindex fcfe13a7..cfaa1176 100644--- a/apps/desktop/src/renderer/editor/commands/heading1.tsx+++ b/apps/desktop/src/renderer/editor/commands/heading1.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { Heading1 } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const Heading1Command: EditorCommand = {key: 'heading1',name: 'Heading 1',diff --git a/apps/desktop/src/renderer/editor/commands/heading2.tsx b/apps/desktop/src/renderer/editor/commands/heading2.tsxindex 275d9b31..f9396fc5 100644--- a/apps/desktop/src/renderer/editor/commands/heading2.tsx+++ b/apps/desktop/src/renderer/editor/commands/heading2.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { Heading2 } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const Heading2Command: EditorCommand = {key: 'heading2',name: 'Heading 2',diff --git a/apps/desktop/src/renderer/editor/commands/heading3.tsx b/apps/desktop/src/renderer/editor/commands/heading3.tsxindex d799fa19..5032f417 100644--- a/apps/desktop/src/renderer/editor/commands/heading3.tsx+++ b/apps/desktop/src/renderer/editor/commands/heading3.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { Heading3 } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const Heading3Command: EditorCommand = {key: 'heading3',name: 'Heading 3',diff --git a/apps/desktop/src/renderer/editor/commands/index.tsx b/apps/desktop/src/renderer/editor/commands/index.tsxindex ca03253a..8c4bb9d3 100644--- a/apps/desktop/src/renderer/editor/commands/index.tsx+++ b/apps/desktop/src/renderer/editor/commands/index.tsx@@ -2,15 +2,15 @@ import { BlockquoteCommand } from '@/renderer/editor/commands/blockquote';import { BulletListCommand } from '@/renderer/editor/commands/bullet-list';import { CodeBlockCommand } from '@/renderer/editor/commands/code-block';import { DividerCommand } from '@/renderer/editor/commands/divider';+import { FileCommand } from '@/renderer/editor/commands/file';+import { FolderCommand } from '@/renderer/editor/commands/folder';import { Heading1Command } from '@/renderer/editor/commands/heading1';import { Heading2Command } from '@/renderer/editor/commands/heading2';import { Heading3Command } from '@/renderer/editor/commands/heading3';import { OrderedListCommand } from '@/renderer/editor/commands/ordered-list';+import { PageCommand } from '@/renderer/editor/commands/page';import { ParagraphCommand } from '@/renderer/editor/commands/paragraph';import { TodoCommand } from '@/renderer/editor/commands/todo';-import { PageCommand } from '@/renderer/editor/commands/page';-import { FolderCommand } from '@/renderer/editor/commands/folder';-import { FileCommand } from '@/renderer/editor/commands/file';import { EditorCommand, EditorCommandProps } from '@/shared/types/editor';export type { EditorCommand, EditorCommandProps };@@ -19,14 +19,14 @@ export {BlockquoteCommand,BulletListCommand,CodeBlockCommand,+ DividerCommand,+ FileCommand,+ FolderCommand,Heading1Command,Heading2Command,Heading3Command,OrderedListCommand,+ PageCommand,ParagraphCommand,- DividerCommand,TodoCommand,- PageCommand,- FolderCommand,- FileCommand,};diff --git a/apps/desktop/src/renderer/editor/commands/ordered-list.tsx b/apps/desktop/src/renderer/editor/commands/ordered-list.tsxindex 6aca8d27..6c7220a6 100644--- a/apps/desktop/src/renderer/editor/commands/ordered-list.tsx+++ b/apps/desktop/src/renderer/editor/commands/ordered-list.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { ListOrdered } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const OrderedListCommand: EditorCommand = {key: 'ordered-list',name: 'Ordered List',diff --git a/apps/desktop/src/renderer/editor/commands/page.tsx b/apps/desktop/src/renderer/editor/commands/page.tsxindex b2a7bf2a..3160420c 100644--- a/apps/desktop/src/renderer/editor/commands/page.tsx+++ b/apps/desktop/src/renderer/editor/commands/page.tsx@@ -1,7 +1,8 @@-import { EditorCommand } from '@/shared/types/editor';import { NodeTypes } from '@colanode/core';import { FileText } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const PageCommand: EditorCommand = {key: 'page',name: 'Page',diff --git a/apps/desktop/src/renderer/editor/commands/paragraph.tsx b/apps/desktop/src/renderer/editor/commands/paragraph.tsxindex cf9733f9..20022645 100644--- a/apps/desktop/src/renderer/editor/commands/paragraph.tsx+++ b/apps/desktop/src/renderer/editor/commands/paragraph.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { Pilcrow } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const ParagraphCommand: EditorCommand = {key: 'paragraph',name: 'Text',diff --git a/apps/desktop/src/renderer/editor/commands/todo.tsx b/apps/desktop/src/renderer/editor/commands/todo.tsxindex 70726f5c..27e3d8f8 100644--- a/apps/desktop/src/renderer/editor/commands/todo.tsx+++ b/apps/desktop/src/renderer/editor/commands/todo.tsx@@ -1,6 +1,7 @@-import { EditorCommand } from '@/shared/types/editor';import { ListTodo } from 'lucide-react';+import { EditorCommand } from '@/shared/types/editor';+export const TodoCommand: EditorCommand = {key: 'todo',name: 'To-do',diff --git a/apps/desktop/src/renderer/editor/extensions/commander.tsx b/apps/desktop/src/renderer/editor/extensions/commander.tsxindex 0c5de058..4d7c2902 100644--- a/apps/desktop/src/renderer/editor/extensions/commander.tsx+++ b/apps/desktop/src/renderer/editor/extensions/commander.tsx@@ -1,4 +1,3 @@-import React from 'react';import type { Range } from '@tiptap/core';import { Editor, Extension } from '@tiptap/core';import { ReactRenderer } from '@tiptap/react';@@ -7,9 +6,11 @@ import {type SuggestionKeyDownProps,type SuggestionProps,} from '@tiptap/suggestion';+import React from 'react';import tippy from 'tippy.js';-import { EditorCommandContext, EditorCommand } from '@/shared/types/editor';+import { updateScrollView } from '@/shared/lib/utils';+import { EditorCommand,EditorCommandContext } from '@/shared/types/editor';interface CommanderOptions {commands: EditorCommand[];diff --git a/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsx b/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsxindex 91ca0743..c1b1474b 100644--- a/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsx+++ b/apps/desktop/src/renderer/editor/extensions/file-placeholder.tsx@@ -1,8 +1,9 @@-import { mergeAttributes, Node, CommandProps } from '@tiptap/core';+import { generateId, IdType } from '@colanode/core';+import { CommandProps,mergeAttributes, Node } from '@tiptap/core';import { ReactNodeViewRenderer } from '@tiptap/react';+import { FilePlaceholderNodeView } from '@/renderer/editor/views';import { FileMetadata } from '@/shared/types/files';-import { generateId, IdType } from '@colanode/core';declare module '@tiptap/core' {interface Commands<ReturnType> {diff --git a/apps/desktop/src/renderer/editor/extensions/file.tsx b/apps/desktop/src/renderer/editor/extensions/file.tsxindex ca26aac5..d5ab3e32 100644--- a/apps/desktop/src/renderer/editor/extensions/file.tsx+++ b/apps/desktop/src/renderer/editor/extensions/file.tsx@@ -1,5 +1,6 @@import { mergeAttributes, Node } from '@tiptap/core';import { ReactNodeViewRenderer } from '@tiptap/react';+import { FileNodeView } from '@/renderer/editor/views';export const FileNode = Node.create({diff --git a/apps/desktop/src/renderer/editor/extensions/folder.tsx b/apps/desktop/src/renderer/editor/extensions/folder.tsxindex d912fbc8..4d4bb5da 100644--- a/apps/desktop/src/renderer/editor/extensions/folder.tsx+++ b/apps/desktop/src/renderer/editor/extensions/folder.tsx@@ -1,5 +1,6 @@import { mergeAttributes, Node } from '@tiptap/core';import { ReactNodeViewRenderer } from '@tiptap/react';+import { FolderNodeView } from '@/renderer/editor/views';export const FolderNode = Node.create({diff --git a/apps/desktop/src/renderer/editor/extensions/heading1.tsx b/apps/desktop/src/renderer/editor/extensions/heading1.tsxindex fa793919..021230e2 100644--- a/apps/desktop/src/renderer/editor/extensions/heading1.tsx+++ b/apps/desktop/src/renderer/editor/extensions/heading1.tsx@@ -1,4 +1,5 @@import { mergeAttributes, Node, textblockTypeInputRule } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';export interface Heading1Options {diff --git a/apps/desktop/src/renderer/editor/extensions/heading2.tsx b/apps/desktop/src/renderer/editor/extensions/heading2.tsxindex 85060606..f4c3ad58 100644--- a/apps/desktop/src/renderer/editor/extensions/heading2.tsx+++ b/apps/desktop/src/renderer/editor/extensions/heading2.tsx@@ -1,4 +1,5 @@import { mergeAttributes, Node, textblockTypeInputRule } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';export interface Heading2Options {diff --git a/apps/desktop/src/renderer/editor/extensions/heading3.tsx b/apps/desktop/src/renderer/editor/extensions/heading3.tsxindex 944c6e85..b886027f 100644--- a/apps/desktop/src/renderer/editor/extensions/heading3.tsx+++ b/apps/desktop/src/renderer/editor/extensions/heading3.tsx@@ -1,4 +1,5 @@import { mergeAttributes, Node, textblockTypeInputRule } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';export interface Heading3Options {diff --git a/apps/desktop/src/renderer/editor/extensions/id.tsx b/apps/desktop/src/renderer/editor/extensions/id.tsxindex fea7f089..db86843b 100644--- a/apps/desktop/src/renderer/editor/extensions/id.tsx+++ b/apps/desktop/src/renderer/editor/extensions/id.tsx@@ -1,6 +1,6 @@+import { EditorNodeTypes,generateId, getIdTypeFromNode } from '@colanode/core';import { Extension } from '@tiptap/react';import { Plugin, PluginKey } from 'prosemirror-state';-import { generateId, getIdTypeFromNode, EditorNodeTypes } from '@colanode/core';const types = [EditorNodeTypes.Paragraph,diff --git a/apps/desktop/src/renderer/editor/extensions/index.tsx b/apps/desktop/src/renderer/editor/extensions/index.tsxindex 814b349d..0a7f0514 100644--- a/apps/desktop/src/renderer/editor/extensions/index.tsx+++ b/apps/desktop/src/renderer/editor/extensions/index.tsx@@ -5,7 +5,6 @@ import StrikethroughMark from '@tiptap/extension-strike';import TextNode from '@tiptap/extension-text';import UnderlineMark from '@tiptap/extension-underline';-import { IdExtension } from '@/renderer/editor/extensions/id';import { BlockquoteNode } from '@/renderer/editor/extensions/blockquote';import { BulletListNode } from '@/renderer/editor/extensions/bullet-list';import { CodeMark } from '@/renderer/editor/extensions/code';@@ -15,32 +14,31 @@ import { CommanderExtension } from '@/renderer/editor/extensions/commander';import { DeleteControlExtension } from '@/renderer/editor/extensions/delete-control';import { DividerNode } from '@/renderer/editor/extensions/divider';import { DropcursorExtension } from '@/renderer/editor/extensions/dropcursor';+import { FileNode } from '@/renderer/editor/extensions/file';+import { FilePlaceholderNode } from '@/renderer/editor/extensions/file-placeholder';+import { FolderNode } from '@/renderer/editor/extensions/folder';import { Heading1Node } from '@/renderer/editor/extensions/heading1';import { Heading2Node } from '@/renderer/editor/extensions/heading2';import { Heading3Node } from '@/renderer/editor/extensions/heading3';import { HighlightMark } from '@/renderer/editor/extensions/highlight';+import { IdExtension } from '@/renderer/editor/extensions/id';import { LinkMark } from '@/renderer/editor/extensions/link';import { ListItemNode } from '@/renderer/editor/extensions/list-item';import { ListKeymapExtension } from '@/renderer/editor/extensions/list-keymap';import { MessageNode } from '@/renderer/editor/extensions/message';import { OrderedListNode } from '@/renderer/editor/extensions/ordered-list';+import { PageNode } from '@/renderer/editor/extensions/page';import { ParagraphNode } from '@/renderer/editor/extensions/paragraph';import { PlaceholderExtension } from '@/renderer/editor/extensions/placeholder';import { TabKeymapExtension } from '@/renderer/editor/extensions/tab-keymap';import { TaskItemNode } from '@/renderer/editor/extensions/task-item';import { TaskListNode } from '@/renderer/editor/extensions/task-list';import { TrailingNode } from '@/renderer/editor/extensions/trailing-node';-import { PageNode } from '@/renderer/editor/extensions/page';-import { FolderNode } from '@/renderer/editor/extensions/folder';-import { FileNode } from '@/renderer/editor/extensions/file';-import { FilePlaceholderNode } from '@/renderer/editor/extensions/file-placeholder';export {- IdExtension,- BoldMark,BlockquoteNode,+ BoldMark,BulletListNode,- TabKeymapExtension,CodeBlockNode,CodeMark,ColorMark,@@ -48,27 +46,29 @@ export {DeleteControlExtension,DividerNode,DocumentNode,+ DropcursorExtension,+ FileNode,+ FilePlaceholderNode,+ FolderNode,Heading1Node,Heading2Node,Heading3Node,HighlightMark,+ IdExtension,ItalicMark,LinkMark,ListItemNode,ListKeymapExtension,MessageNode,- PlaceholderExtension,OrderedListNode,+ PageNode,ParagraphNode,+ PlaceholderExtension,StrikethroughMark,+ TabKeymapExtension,TaskItemNode,TaskListNode,TextNode,TrailingNode,UnderlineMark,- DropcursorExtension,- PageNode,- FolderNode,- FileNode,- FilePlaceholderNode,};diff --git a/apps/desktop/src/renderer/editor/extensions/page.tsx b/apps/desktop/src/renderer/editor/extensions/page.tsxindex 6be47c97..68cd775c 100644--- a/apps/desktop/src/renderer/editor/extensions/page.tsx+++ b/apps/desktop/src/renderer/editor/extensions/page.tsx@@ -1,5 +1,6 @@import { mergeAttributes, Node } from '@tiptap/core';import { ReactNodeViewRenderer } from '@tiptap/react';+import { PageNodeView } from '@/renderer/editor/views';const PageNode = Node.create({diff --git a/apps/desktop/src/renderer/editor/extensions/trailing-node.tsx b/apps/desktop/src/renderer/editor/extensions/trailing-node.tsxindex 549f94fe..3a172e6c 100644--- a/apps/desktop/src/renderer/editor/extensions/trailing-node.tsx+++ b/apps/desktop/src/renderer/editor/extensions/trailing-node.tsx@@ -1,5 +1,5 @@import { Extension } from '@tiptap/core';-import { NodeType, Node } from '@tiptap/pm/model';+import { Node,NodeType } from '@tiptap/pm/model';import { Plugin, PluginKey } from '@tiptap/pm/state';const nodeEqualsType = ({diff --git a/apps/desktop/src/renderer/editor/menu/bubble-menu.tsx b/apps/desktop/src/renderer/editor/menu/bubble-menu.tsxindex 281ab1fa..8ffc0a5c 100644--- a/apps/desktop/src/renderer/editor/menu/bubble-menu.tsx+++ b/apps/desktop/src/renderer/editor/menu/bubble-menu.tsx@@ -3,11 +3,12 @@ import {type BubbleMenuProps,isNodeSelection,} from '@tiptap/react';+import { Bold, Code, Italic, Strikethrough, Underline } from 'lucide-react';import { useState } from 'react';+import { ColorButton } from '@/renderer/editor/menu/color-button';import { LinkButton } from '@/renderer/editor/menu/link-button';import { cn } from '@/shared/lib/utils';-import { Bold, Code, Italic, Strikethrough, Underline } from 'lucide-react';type EditorBubbleMenuProps = Omit<BubbleMenuProps, 'children'>;diff --git a/apps/desktop/src/renderer/editor/menu/color-button.tsx b/apps/desktop/src/renderer/editor/menu/color-button.tsxindex 7a834d7d..89bc9073 100644--- a/apps/desktop/src/renderer/editor/menu/color-button.tsx+++ b/apps/desktop/src/renderer/editor/menu/color-button.tsx@@ -1,11 +1,12 @@import { Editor } from '@tiptap/core';+import { Baseline } from 'lucide-react';+import {Popover,- PopoverTrigger,PopoverContent,+ PopoverTrigger,} from '@/renderer/components/ui/popover';import { cn } from '@/shared/lib/utils';-import { Baseline } from 'lucide-react';interface ColorItem {color: string;diff --git a/apps/desktop/src/renderer/editor/menu/link-button.tsx b/apps/desktop/src/renderer/editor/menu/link-button.tsxindex 75b14b86..d4990047 100644--- a/apps/desktop/src/renderer/editor/menu/link-button.tsx+++ b/apps/desktop/src/renderer/editor/menu/link-button.tsx@@ -1,13 +1,13 @@import { Editor } from '@tiptap/core';+import { Check, Link, Trash2 } from 'lucide-react';import { Input } from '@/renderer/components/ui/input';import {Popover,- PopoverTrigger,PopoverContent,+ PopoverTrigger,} from '@/renderer/components/ui/popover';import { cn } from '@/shared/lib/utils';-import { Check, Link, Trash2 } from 'lucide-react';const isValidUrl = (url: string) => {try {diff --git a/apps/desktop/src/renderer/editor/renderers/blockquote.tsx b/apps/desktop/src/renderer/editor/renderers/blockquote.tsxindex 0873c00a..7b811b12 100644--- a/apps/desktop/src/renderer/editor/renderers/blockquote.tsx+++ b/apps/desktop/src/renderer/editor/renderers/blockquote.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface BlockquoteRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/bullet-list.tsx b/apps/desktop/src/renderer/editor/renderers/bullet-list.tsxindex ea773779..74f13118 100644--- a/apps/desktop/src/renderer/editor/renderers/bullet-list.tsx+++ b/apps/desktop/src/renderer/editor/renderers/bullet-list.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface BulletListRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/code-block.tsx b/apps/desktop/src/renderer/editor/renderers/code-block.tsxindex d069ee7f..f8cb515c 100644--- a/apps/desktop/src/renderer/editor/renderers/code-block.tsx+++ b/apps/desktop/src/renderer/editor/renderers/code-block.tsx@@ -1,8 +1,9 @@+import { JSONContent } from '@tiptap/core';+import { Clipboard } from 'lucide-react';import React from 'react';+import { defaultClasses } from '@/renderer/editor/classes';import { highlightCode, languages } from '@/shared/lib/lowlight';-import { JSONContent } from '@tiptap/core';-import { Clipboard } from 'lucide-react';interface CodeBlockRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/document.tsx b/apps/desktop/src/renderer/editor/renderers/document.tsxindex 944fa55a..4aabf459 100644--- a/apps/desktop/src/renderer/editor/renderers/document.tsx+++ b/apps/desktop/src/renderer/editor/renderers/document.tsx@@ -1,6 +1,7 @@-import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';import { JSONContent } from '@tiptap/core';+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';+interface DocumentRendererProps {node: JSONContent;keyPrefix: string | null;diff --git a/apps/desktop/src/renderer/editor/renderers/file.tsx b/apps/desktop/src/renderer/editor/renderers/file.tsxindex fcf854bc..b6356936 100644--- a/apps/desktop/src/renderer/editor/renderers/file.tsx+++ b/apps/desktop/src/renderer/editor/renderers/file.tsx@@ -1,4 +1,5 @@import { JSONContent } from '@tiptap/core';+import { FileBlock } from '@/renderer/components/files/file-block';interface FileRendererProps {diff --git a/apps/desktop/src/renderer/editor/renderers/heading1.tsx b/apps/desktop/src/renderer/editor/renderers/heading1.tsxindex de652b6b..0fcf7937 100644--- a/apps/desktop/src/renderer/editor/renderers/heading1.tsx+++ b/apps/desktop/src/renderer/editor/renderers/heading1.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface Heading1RendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/heading2.tsx b/apps/desktop/src/renderer/editor/renderers/heading2.tsxindex 41d7925c..4bb3033a 100644--- a/apps/desktop/src/renderer/editor/renderers/heading2.tsx+++ b/apps/desktop/src/renderer/editor/renderers/heading2.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface Heading2RendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/heading3.tsx b/apps/desktop/src/renderer/editor/renderers/heading3.tsxindex 36d33881..0888067d 100644--- a/apps/desktop/src/renderer/editor/renderers/heading3.tsx+++ b/apps/desktop/src/renderer/editor/renderers/heading3.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface Heading3RendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/list-item.tsx b/apps/desktop/src/renderer/editor/renderers/list-item.tsxindex b86852c8..3b1bda95 100644--- a/apps/desktop/src/renderer/editor/renderers/list-item.tsx+++ b/apps/desktop/src/renderer/editor/renderers/list-item.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface ListItemRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/mark.tsx b/apps/desktop/src/renderer/editor/renderers/mark.tsxindex 828de10a..420c5b51 100644--- a/apps/desktop/src/renderer/editor/renderers/mark.tsx+++ b/apps/desktop/src/renderer/editor/renderers/mark.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';import React from 'react';+import { defaultClasses } from '@/renderer/editor/classes';-import { JSONContent } from '@tiptap/core';interface MarkRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/message.tsx b/apps/desktop/src/renderer/editor/renderers/message.tsxindex f9a5ad78..728af85e 100644--- a/apps/desktop/src/renderer/editor/renderers/message.tsx+++ b/apps/desktop/src/renderer/editor/renderers/message.tsx@@ -1,6 +1,7 @@-import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';import { JSONContent } from '@tiptap/core';+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';+interface MessageRendererProps {node: JSONContent;keyPrefix: string | null;diff --git a/apps/desktop/src/renderer/editor/renderers/node-children.tsx b/apps/desktop/src/renderer/editor/renderers/node-children.tsxindex e801b55b..6f42ab98 100644--- a/apps/desktop/src/renderer/editor/renderers/node-children.tsx+++ b/apps/desktop/src/renderer/editor/renderers/node-children.tsx@@ -1,7 +1,7 @@+import { JSONContent } from '@tiptap/core';import React from 'react';import { NodeRenderer } from '@/renderer/editor/renderers/node';-import { JSONContent } from '@tiptap/core';interface NodeChildrenRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/node.tsx b/apps/desktop/src/renderer/editor/renderers/node.tsxindex 5d74bcae..59caf5c5 100644--- a/apps/desktop/src/renderer/editor/renderers/node.tsx+++ b/apps/desktop/src/renderer/editor/renderers/node.tsx@@ -1,22 +1,23 @@+import { JSONContent } from '@tiptap/core';import { ReactElement } from 'react';+import { match } from 'ts-pattern';+import { BlockquoteRenderer } from '@/renderer/editor/renderers/blockquote';import { BulletListRenderer } from '@/renderer/editor/renderers/bullet-list';import { CodeBlockRenderer } from '@/renderer/editor/renderers/code-block';import { DocumentRenderer } from '@/renderer/editor/renderers/document';+import { FileRenderer } from '@/renderer/editor/renderers/file';import { Heading1Renderer } from '@/renderer/editor/renderers/heading1';import { Heading2Renderer } from '@/renderer/editor/renderers/heading2';import { Heading3Renderer } from '@/renderer/editor/renderers/heading3';import { ListItemRenderer } from '@/renderer/editor/renderers/list-item';+import { MarkRenderer } from '@/renderer/editor/renderers/mark';import { MessageRenderer } from '@/renderer/editor/renderers/message';import { OrderedListRenderer } from '@/renderer/editor/renderers/ordered-list';import { ParagraphRenderer } from '@/renderer/editor/renderers/paragraph';import { TaskItemRenderer } from '@/renderer/editor/renderers/task-item';import { TaskListRenderer } from '@/renderer/editor/renderers/task-list';import { TextRenderer } from '@/renderer/editor/renderers/text';-import { MarkRenderer } from '@/renderer/editor/renderers/mark';-import { FileRenderer } from '@/renderer/editor/renderers/file';-import { match } from 'ts-pattern';-import { JSONContent } from '@tiptap/core';interface NodeRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/ordered-list.tsx b/apps/desktop/src/renderer/editor/renderers/ordered-list.tsxindex a732409f..e4cc0c92 100644--- a/apps/desktop/src/renderer/editor/renderers/ordered-list.tsx+++ b/apps/desktop/src/renderer/editor/renderers/ordered-list.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface OrderedListRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/paragraph.tsx b/apps/desktop/src/renderer/editor/renderers/paragraph.tsxindex 5c0ba0c0..76fd690c 100644--- a/apps/desktop/src/renderer/editor/renderers/paragraph.tsx+++ b/apps/desktop/src/renderer/editor/renderers/paragraph.tsx@@ -1,7 +1,8 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';import { cn } from '@/shared/lib/utils';-import { JSONContent } from '@tiptap/core';interface ParagraphRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/task-item.tsx b/apps/desktop/src/renderer/editor/renderers/task-item.tsxindex 0ffc1d49..58483432 100644--- a/apps/desktop/src/renderer/editor/renderers/task-item.tsx+++ b/apps/desktop/src/renderer/editor/renderers/task-item.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface TaskItemRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/task-list.tsx b/apps/desktop/src/renderer/editor/renderers/task-list.tsxindex 04822420..df5380a6 100644--- a/apps/desktop/src/renderer/editor/renderers/task-list.tsx+++ b/apps/desktop/src/renderer/editor/renderers/task-list.tsx@@ -1,6 +1,7 @@+import { JSONContent } from '@tiptap/core';+import { defaultClasses } from '@/renderer/editor/classes';import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';-import { JSONContent } from '@tiptap/core';interface TaskListRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/renderers/text.tsx b/apps/desktop/src/renderer/editor/renderers/text.tsxindex b747f20b..2c1ceab5 100644--- a/apps/desktop/src/renderer/editor/renderers/text.tsx+++ b/apps/desktop/src/renderer/editor/renderers/text.tsx@@ -1,5 +1,5 @@-import React from 'react';import { JSONContent } from '@tiptap/core';+import React from 'react';interface TextRendererProps {node: JSONContent;diff --git a/apps/desktop/src/renderer/editor/views/code-block.tsx b/apps/desktop/src/renderer/editor/views/code-block.tsxindex 5f9ee6cc..e35d0bae 100644--- a/apps/desktop/src/renderer/editor/views/code-block.tsx+++ b/apps/desktop/src/renderer/editor/views/code-block.tsx@@ -1,7 +1,10 @@import '@/renderer/styles/highlight.css';-import React from 'react';+import { type NodeViewProps } from '@tiptap/core';import { NodeViewContent, NodeViewWrapper } from '@tiptap/react';+import { Check, ChevronDown, Clipboard } from 'lucide-react';+import React from 'react';+import {Command,CommandEmpty,@@ -18,7 +21,6 @@ import {import { defaultClasses } from '@/renderer/editor/classes';import { languages } from '@/shared/lib/lowlight';import { cn } from '@/shared/lib/utils';-import { ChevronDown, Check, Clipboard } from 'lucide-react';export const CodeBlockNodeView = ({node,diff --git a/apps/desktop/src/renderer/editor/views/file-placeholder.tsx b/apps/desktop/src/renderer/editor/views/file-placeholder.tsxindex db5f62ff..489ff8ca 100644--- a/apps/desktop/src/renderer/editor/views/file-placeholder.tsx+++ b/apps/desktop/src/renderer/editor/views/file-placeholder.tsx@@ -1,11 +1,12 @@import { type NodeViewProps } from '@tiptap/core';-import { match } from 'ts-pattern';import { NodeViewWrapper } from '@tiptap/react';-import { getFilePlaceholderUrl } from '@/shared/lib/files';import { X } from 'lucide-react';+import { match } from 'ts-pattern';+import { FilePreviewImage } from '@/renderer/components/files/previews/file-preview-image';-import { FilePreviewVideo } from '@/renderer/components/files/previews/file-preview-video';import { FilePreviewOther } from '@/renderer/components/files/previews/file-preview-other';+import { FilePreviewVideo } from '@/renderer/components/files/previews/file-preview-video';+import { getFilePlaceholderUrl } from '@/shared/lib/files';export const FilePlaceholderNodeView = ({node,diff --git a/apps/desktop/src/renderer/editor/views/file.tsx b/apps/desktop/src/renderer/editor/views/file.tsxindex 988a070f..b8aacdf3 100644--- a/apps/desktop/src/renderer/editor/views/file.tsx+++ b/apps/desktop/src/renderer/editor/views/file.tsx@@ -1,5 +1,6 @@import { type NodeViewProps } from '@tiptap/core';import { NodeViewWrapper } from '@tiptap/react';+import { FileBlock } from '@/renderer/components/files/file-block';export const FileNodeView = ({ node }: NodeViewProps) => {diff --git a/apps/desktop/src/renderer/editor/views/folder.tsx b/apps/desktop/src/renderer/editor/views/folder.tsxindex 729b4d2a..e336b7d0 100644--- a/apps/desktop/src/renderer/editor/views/folder.tsx+++ b/apps/desktop/src/renderer/editor/views/folder.tsx@@ -1,5 +1,6 @@import { type NodeViewProps } from '@tiptap/core';import { NodeViewWrapper } from '@tiptap/react';+import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';diff --git a/apps/desktop/src/renderer/editor/views/index.tsx b/apps/desktop/src/renderer/editor/views/index.tsxindex 4dedfb32..68214ddc 100644--- a/apps/desktop/src/renderer/editor/views/index.tsx+++ b/apps/desktop/src/renderer/editor/views/index.tsx@@ -1,13 +1,13 @@import { CodeBlockNodeView } from '@/renderer/editor/views/code-block';-import { PageNodeView } from '@/renderer/editor/views/page';-import { FolderNodeView } from '@/renderer/editor/views/folder';import { FileNodeView } from '@/renderer/editor/views/file';import { FilePlaceholderNodeView } from '@/renderer/editor/views/file-placeholder';+import { FolderNodeView } from '@/renderer/editor/views/folder';+import { PageNodeView } from '@/renderer/editor/views/page';export {CodeBlockNodeView,- PageNodeView,- FolderNodeView,FileNodeView,FilePlaceholderNodeView,+ FolderNodeView,+ PageNodeView,};diff --git a/apps/desktop/src/renderer/editor/views/page.tsx b/apps/desktop/src/renderer/editor/views/page.tsxindex 09fc77c6..1fcbd987 100644--- a/apps/desktop/src/renderer/editor/views/page.tsx+++ b/apps/desktop/src/renderer/editor/views/page.tsx@@ -1,5 +1,6 @@import { type NodeViewProps } from '@tiptap/core';import { NodeViewWrapper } from '@tiptap/react';+import { Avatar } from '@/renderer/components/avatars/avatar';import { useWorkspace } from '@/renderer/contexts/workspace';import { useQuery } from '@/renderer/hooks/use-query';diff --git a/apps/desktop/src/renderer/hooks/use-mutation.tsx b/apps/desktop/src/renderer/hooks/use-mutation.tsxindex d87ddbfb..e598987b 100644--- a/apps/desktop/src/renderer/hooks/use-mutation.tsx+++ b/apps/desktop/src/renderer/hooks/use-mutation.tsx@@ -1,4 +1,5 @@import React from 'react';+import { MutationInput, MutationMap } from '@/shared/mutations';interface MutationOptions<T extends MutationInput> {diff --git a/apps/desktop/src/renderer/hooks/use-queries.tsx b/apps/desktop/src/renderer/hooks/use-queries.tsxindex a3143d98..3c4e6d47 100644--- a/apps/desktop/src/renderer/hooks/use-queries.tsx+++ b/apps/desktop/src/renderer/hooks/use-queries.tsx@@ -1,6 +1,7 @@-import { QueryInput } from '@/shared/queries';-import { sha256 } from 'js-sha256';import { useQueries as useTanstackQueries } from '@tanstack/react-query';+import { sha256 } from 'js-sha256';++import { QueryInput } from '@/shared/queries';export const useQueries = <T extends QueryInput>(inputs: T[]) => {const result = useTanstackQueries({diff --git a/apps/desktop/src/renderer/hooks/use-query.tsx b/apps/desktop/src/renderer/hooks/use-query.tsxindex 73f9b29b..fabdf654 100644--- a/apps/desktop/src/renderer/hooks/use-query.tsx+++ b/apps/desktop/src/renderer/hooks/use-query.tsx@@ -1,9 +1,10 @@-import { QueryInput, QueryMap } from '@/shared/queries';-import { sha256 } from 'js-sha256';import {useQuery as useTanstackQuery,UseQueryOptions as TanstackUseQueryOptions,} from '@tanstack/react-query';+import { sha256 } from 'js-sha256';++import { QueryInput, QueryMap } from '@/shared/queries';type UseQueryOptions<T extends QueryInput> = Omit<TanstackUseQueryOptions<QueryMap[T['type']]['output']>,diff --git a/apps/desktop/src/renderer/hooks/use-toast.ts b/apps/desktop/src/renderer/hooks/use-toast.tsindex 675a06ef..213b5a03 100644--- a/apps/desktop/src/renderer/hooks/use-toast.ts+++ b/apps/desktop/src/renderer/hooks/use-toast.ts@@ -187,4 +187,4 @@ const useToast = () => {};};-export { useToast, toast };+export { toast,useToast };diff --git a/apps/desktop/src/renderer/hooks/user-records-query.tsx b/apps/desktop/src/renderer/hooks/user-records-query.tsxindex add79261..da3df464 100644--- a/apps/desktop/src/renderer/hooks/user-records-query.tsx+++ b/apps/desktop/src/renderer/hooks/user-records-query.tsx@@ -1,9 +1,10 @@+import { ViewFilterAttributes, ViewSortAttributes } from '@colanode/core';import React from 'react';+import { useDatabase } from '@/renderer/contexts/database';import { useWorkspace } from '@/renderer/contexts/workspace';-import { ViewFilterAttributes, ViewSortAttributes } from '@colanode/core';-import { RecordListQueryInput } from '@/shared/queries/record-list';import { useQueries } from '@/renderer/hooks/use-queries';+import { RecordListQueryInput } from '@/shared/queries/record-list';const RECORDS_PER_PAGE = 50;diff --git a/apps/desktop/src/renderer/root.tsx b/apps/desktop/src/renderer/root.tsxindex 681dbc76..9e33769e 100644--- a/apps/desktop/src/renderer/root.tsx+++ b/apps/desktop/src/renderer/root.tsx@@ -1,23 +1,25 @@import '@/renderer/styles/index.css';++import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import React from 'react';+import { DndProvider } from 'react-dnd';+import { HTML5Backend } from 'react-dnd-html5-backend';import { createRoot } from 'react-dom/client';+import { createHashRouter, RouterProvider } from 'react-router-dom';+import { App } from '@/renderer/app';-import { TooltipProvider } from '@/renderer/components/ui/tooltip';+import { Account } from '@/renderer/components/accounts/account';+import { AccountRedirect } from '@/renderer/components/accounts/account-redirect';+import { Login } from '@/renderer/components/accounts/login';+import { DelayedComponent } from '@/renderer/components/ui/delayed-component';import { Toaster } from '@/renderer/components/ui/toaster';-import { WorkspaceCreate } from '@/renderer/components/workspaces/workspace-create';+import { TooltipProvider } from '@/renderer/components/ui/tooltip';import { Workspace } from '@/renderer/components/workspaces/workspace';+import { WorkspaceCreate } from '@/renderer/components/workspaces/workspace-create';import { WorkspaceRedirect } from '@/renderer/components/workspaces/workspace-redirect';-import { createHashRouter, RouterProvider } from 'react-router-dom';-import { DndProvider } from 'react-dnd';-import { HTML5Backend } from 'react-dnd-html5-backend';-import { Login } from '@/renderer/components/accounts/login';-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { useEventBus } from '@/renderer/hooks/use-event-bus';-import { Event } from '@/shared/types/events';-import { AccountRedirect } from '@/renderer/components/accounts/account-redirect';-import { Account } from '@/renderer/components/accounts/account';-import { DelayedComponent } from '@/renderer/components/ui/delayed-component';import { RootLoader } from '@/renderer/root-loader';+import { Event } from '@/shared/types/events';const router = createHashRouter([{diff --git a/apps/desktop/src/shared/lib/avatars.ts b/apps/desktop/src/shared/lib/avatars.tsindex 58861524..1f67096b 100644--- a/apps/desktop/src/shared/lib/avatars.ts+++ b/apps/desktop/src/shared/lib/avatars.ts@@ -1,4 +1,4 @@-import { IdType, hashCode } from '@colanode/core';+import { hashCode,IdType } from '@colanode/core';export const getAvatarSizeClasses = (size?: string) => {if (size === 'small') {diff --git a/apps/desktop/src/shared/lib/axios.ts b/apps/desktop/src/shared/lib/axios.tsindex 9c6cab56..aee76a06 100644--- a/apps/desktop/src/shared/lib/axios.ts+++ b/apps/desktop/src/shared/lib/axios.ts@@ -1,4 +1,5 @@import { isAxiosError } from 'axios';+import { ApiErrorOutput } from '@/shared/types/errors';export const parseApiError = (error: unknown): ApiErrorOutput => {diff --git a/apps/desktop/src/shared/lib/databases.ts b/apps/desktop/src/shared/lib/databases.tsindex a634fc34..43da68fb 100644--- a/apps/desktop/src/shared/lib/databases.ts+++ b/apps/desktop/src/shared/lib/databases.ts@@ -1,17 +1,17 @@import {- FieldType,+ compareString,FieldAttributes,- ViewFieldFilterAttributes,- ViewFilterAttributes,- ViewFieldAttributes,- RecordNode,+ FieldType,FieldValue,+ generateNodeIndex,+ isStringArray,MultiSelectFieldAttributes,+ RecordNode,SelectFieldAttributes,+ ViewFieldAttributes,+ ViewFieldFilterAttributes,+ ViewFilterAttributes,ViewType,- generateNodeIndex,- compareString,- isStringArray,} from '@colanode/core';export const getDefaultFieldWidth = (type: FieldType): number => {diff --git a/apps/desktop/src/shared/lib/editor.ts b/apps/desktop/src/shared/lib/editor.tsindex b07ab91b..968f6d2f 100644--- a/apps/desktop/src/shared/lib/editor.ts+++ b/apps/desktop/src/shared/lib/editor.ts@@ -1,11 +1,11 @@import {+ Block,+ BlockLeaf,+ compareString,EditorNodeTypes,generateId,- getIdTypeFromNode,generateNodeIndex,- compareString,- Block,- BlockLeaf,+ getIdTypeFromNode,} from '@colanode/core';import { JSONContent } from '@tiptap/core';diff --git a/apps/desktop/src/shared/lib/emojis.ts b/apps/desktop/src/shared/lib/emojis.tsindex 3bb92d87..6280b765 100644--- a/apps/desktop/src/shared/lib/emojis.ts+++ b/apps/desktop/src/shared/lib/emojis.ts@@ -1,4 +1,4 @@-import { EmojiData, Emoji } from '@/shared/types/emojis';+import { Emoji,EmojiData } from '@/shared/types/emojis';export const getEmojiUrl = (id: string | null | undefined): string => {if (!id) {diff --git a/apps/desktop/src/shared/lib/http-client.ts b/apps/desktop/src/shared/lib/http-client.tsindex 75fa3178..4dff5d76 100644--- a/apps/desktop/src/shared/lib/http-client.ts+++ b/apps/desktop/src/shared/lib/http-client.ts@@ -1,13 +1,14 @@-import { serverService } from '@/main/services/server-service';-import { BackoffCalculator } from '@/shared/lib/backoff-calculator';import axios, {- isAxiosError,+ AxiosError,AxiosInstance,AxiosRequestConfig,AxiosResponse,- AxiosError,+ isAxiosError,} from 'axios';+import { serverService } from '@/main/services/server-service';+import { BackoffCalculator } from '@/shared/lib/backoff-calculator';+interface HttpClientRequestConfig extends AxiosRequestConfig {domain: string;token?: string | null;diff --git a/apps/desktop/src/shared/lib/icons.ts b/apps/desktop/src/shared/lib/icons.tsindex 7376e498..4dbfd1f3 100644--- a/apps/desktop/src/shared/lib/icons.ts+++ b/apps/desktop/src/shared/lib/icons.ts@@ -1,4 +1,4 @@-import { IconData, Icon } from '@/shared/types/icons';+import { Icon,IconData } from '@/shared/types/icons';export const getIconUrl = (id: string): string => {return `asset://icons/${id}.svg`;diff --git a/apps/desktop/src/shared/lib/lowlight.ts b/apps/desktop/src/shared/lib/lowlight.tsindex 211f94ae..728d0041 100644--- a/apps/desktop/src/shared/lib/lowlight.ts+++ b/apps/desktop/src/shared/lib/lowlight.ts@@ -1,4 +1,4 @@-import { createLowlight, all } from 'lowlight';+import { all,createLowlight } from 'lowlight';export const lowlight = createLowlight(all);const lowlightLanguages = lowlight.listLanguages();diff --git a/apps/desktop/src/shared/lib/nodes.ts b/apps/desktop/src/shared/lib/nodes.tsindex e6dd9ea3..bacee831 100644--- a/apps/desktop/src/shared/lib/nodes.ts+++ b/apps/desktop/src/shared/lib/nodes.ts@@ -1,4 +1,5 @@import { extractNodeCollaborators, Node, NodeTypes } from '@colanode/core';+import { NodeCollaborator } from '@/shared/types/nodes';export const getDefaultNodeIcon = (type: string) => {diff --git a/apps/desktop/src/shared/mutations/email-login.ts b/apps/desktop/src/shared/mutations/email-login.tsindex f4b30602..79d29db4 100644--- a/apps/desktop/src/shared/mutations/email-login.ts+++ b/apps/desktop/src/shared/mutations/email-login.ts@@ -1,6 +1,7 @@-import { Account } from '@/shared/types/accounts';import { WorkspaceOutput } from '@colanode/core';+import { Account } from '@/shared/types/accounts';+export type EmailLoginMutationInput = {type: 'email_login';server: string;diff --git a/apps/desktop/src/shared/mutations/email-register.ts b/apps/desktop/src/shared/mutations/email-register.tsindex 8ebb999d..0a4caec5 100644--- a/apps/desktop/src/shared/mutations/email-register.ts+++ b/apps/desktop/src/shared/mutations/email-register.ts@@ -1,6 +1,7 @@-import { Account } from '@/shared/types/accounts';import { WorkspaceOutput } from '@colanode/core';+import { Account } from '@/shared/types/accounts';+export type EmailRegisterMutationInput = {type: 'email_register';server: string;diff --git a/apps/desktop/src/shared/types/events.ts b/apps/desktop/src/shared/types/events.tsindex dd47608d..0d31a733 100644--- a/apps/desktop/src/shared/types/events.ts+++ b/apps/desktop/src/shared/types/events.ts@@ -1,9 +1,10 @@import { LocalNodeTransaction, Node } from '@colanode/core';+import { Account } from '@/shared/types/accounts';-import { Workspace } from '@/shared/types/workspaces';-import { Server } from '@/shared/types/servers';-import { Download, Upload } from '@/shared/types/nodes';import { Interaction } from '@/shared/types/interactions';+import { Download, Upload } from '@/shared/types/nodes';+import { Server } from '@/shared/types/servers';+import { Workspace } from '@/shared/types/workspaces';export type NodeCreatedEvent = {type: 'node_created';diff --git a/apps/desktop/src/shared/types/window.d.ts b/apps/desktop/src/shared/types/window.d.tsindex 98400a04..c69e07c0 100644--- a/apps/desktop/src/shared/types/window.d.ts+++ b/apps/desktop/src/shared/types/window.d.ts@@ -1,7 +1,7 @@-import { CommandMap, CommandInput } from '@/shared/commands';-import { QueryInput, QueryMap } from '@/shared/queries';-import { MutationInput, MutationMap } from '@/shared/mutations';+import { CommandInput,CommandMap } from '@/shared/commands';import { EventBus } from '@/shared/lib/event-bus';+import { MutationInput, MutationMap } from '@/shared/mutations';+import { QueryInput, QueryMap } from '@/shared/queries';export interface ColanodeApi {init: () => Promise<void>;diff --git a/apps/desktop/vite.base.config.ts b/apps/desktop/vite.base.config.tsindex 2e05b68d..69ea752b 100644--- a/apps/desktop/vite.base.config.ts+++ b/apps/desktop/vite.base.config.ts@@ -1,9 +1,10 @@+import type { ConfigEnv, Plugin, UserConfig } from 'vite';import { builtinModules } from 'node:module';import type { AddressInfo } from 'node:net';-import type { ConfigEnv, Plugin, UserConfig } from 'vite';-import pkg from './package.json';import path from 'path';+import pkg from './package.json';+export const builtins = ['electron',...builtinModules.map((m) => [m, `node:${m}`]).flat(),diff --git a/apps/desktop/vite.main.config.ts b/apps/desktop/vite.main.config.tsindex 0e65d29c..2456da74 100644--- a/apps/desktop/vite.main.config.ts+++ b/apps/desktop/vite.main.config.ts@@ -1,12 +1,13 @@import type { ConfigEnv, UserConfig } from 'vite';import { defineConfig, mergeConfig } from 'vite';+import path from 'path';+import {+ external,getBuildConfig,getBuildDefine,- external,pluginHotRestart,} from './vite.base.config';-import path from 'path';// https://vitejs.dev/configexport default defineConfig((env) => {diff --git a/apps/desktop/vite.preload.config.ts b/apps/desktop/vite.preload.config.tsindex 9e00e6a8..1c8b8137 100644--- a/apps/desktop/vite.preload.config.ts+++ b/apps/desktop/vite.preload.config.ts@@ -1,8 +1,9 @@import type { ConfigEnv, UserConfig } from 'vite';import { defineConfig, mergeConfig } from 'vite';-import { getBuildConfig, external, pluginHotRestart } from './vite.base.config';import path from 'path';+import { external, getBuildConfig, pluginHotRestart } from './vite.base.config';+// https://vitejs.dev/configexport default defineConfig((env) => {const forgeEnv = env as ConfigEnv<'build'>;diff --git a/apps/desktop/vite.renderer.config.ts b/apps/desktop/vite.renderer.config.tsindex 60592a84..c98b2a85 100644--- a/apps/desktop/vite.renderer.config.ts+++ b/apps/desktop/vite.renderer.config.ts@@ -1,8 +1,9 @@import type { ConfigEnv, UserConfig } from 'vite';import { defineConfig } from 'vite';-import { pluginExposeRenderer } from './vite.base.config';import path from 'path';+import { pluginExposeRenderer } from './vite.base.config';+// https://vitejs.dev/configexport default defineConfig((env) => {const forgeEnv = env as ConfigEnv<'renderer'>;diff --git a/apps/server/src/api.ts b/apps/server/src/api.tsindex 6e144d46..658431a2 100644--- a/apps/server/src/api.ts+++ b/apps/server/src/api.ts@@ -1,17 +1,17 @@-import express, { Request, Response } from 'express';import cors from 'cors';+import express, { Request, Response } from 'express';import http from 'http';-import { accountsRouter } from '@/routes/accounts';-import { workspacesRouter } from '@/routes/workspaces';import { authMiddleware } from '@/middlewares/auth';-import { syncRouter } from '@/routes/sync';-import { configRouter } from '@/routes/config';+import { accountsRouter } from '@/routes/accounts';import { avatarsRouter } from '@/routes/avatars';+import { configRouter } from '@/routes/config';import { filesRouter } from '@/routes/files';import { nodesRouter } from '@/routes/nodes';-import { synapse } from '@/services/synapse-service';+import { syncRouter } from '@/routes/sync';+import { workspacesRouter } from '@/routes/workspaces';import { logService } from '@/services/log-service';+import { synapse } from '@/services/synapse-service';const logger = logService.createLogger('api');diff --git a/apps/server/src/data/database.ts b/apps/server/src/data/database.tsindex 04877ebd..a5211ef5 100644--- a/apps/server/src/data/database.ts+++ b/apps/server/src/data/database.ts@@ -8,8 +8,9 @@ import {UpdateResult,} from 'kysely';import pg from 'pg';-import { DatabaseSchema } from '@/data/schema';+import { databaseMigrations } from '@/data/migrations';+import { DatabaseSchema } from '@/data/schema';const dialect = new PostgresDialect({pool: new pg.Pool({diff --git a/apps/server/src/index.ts b/apps/server/src/index.tsindex 48aae2b1..ddea46a4 100644--- a/apps/server/src/index.ts+++ b/apps/server/src/index.ts@@ -1,8 +1,9 @@+import dotenv from 'dotenv';+import { initApi } from '@/api';-import { initRedis } from '@/data/redis';import { migrate } from '@/data/database';+import { initRedis } from '@/data/redis';import { jobService } from '@/services/job-service';-import dotenv from 'dotenv';dotenv.config();diff --git a/apps/server/src/jobs/index.ts b/apps/server/src/jobs/index.tsindex 1cbaa530..08b65c7a 100644--- a/apps/server/src/jobs/index.ts+++ b/apps/server/src/jobs/index.ts@@ -1,8 +1,6 @@-import { JobHandler } from '@/types/jobs';-import { JobMap } from '@/types/jobs';--import { sendEmailHandler } from '@/jobs/send-email';import { cleanWorkspaceDataHandler } from '@/jobs/clean-workspace-data';+import { sendEmailHandler } from '@/jobs/send-email';+import { JobHandler , JobMap } from '@/types/jobs';type JobHandlerMap = {[K in keyof JobMap]: JobHandler<JobMap[K]['input']>;diff --git a/apps/server/src/lib/nodes.ts b/apps/server/src/lib/nodes.tsindex b2320d44..e49b712e 100644--- a/apps/server/src/lib/nodes.ts+++ b/apps/server/src/lib/nodes.ts@@ -1,3 +1,15 @@+import {+ extractNodeCollaborators,+ extractNodeRole,+ Node,+ NodeOutput,+ NodeRole,+ NodeType, ServerCollaboration,+ ServerCollaborationRevocation,+ ServerInteraction,+ ServerNodeTransaction} from '@colanode/core';+import { encodeState } from '@colanode/crdt';+import { database } from '@/data/database';import {SelectCollaboration,@@ -7,21 +19,6 @@ import {SelectNodeTransaction,} from '@/data/schema';import { NodeCollaborator } from '@/types/nodes';-import {- NodeOutput,- NodeRole,- ServerInteraction,- ServerCollaboration,- ServerCollaborationRevocation,- ServerNodeTransaction,-} from '@colanode/core';-import {- extractNodeCollaborators,- extractNodeRole,- Node,- NodeType,-} from '@colanode/core';-import { encodeState } from '@colanode/crdt';export const mapNodeOutput = (node: SelectNode): NodeOutput => {return {diff --git a/apps/server/src/lib/tokens.ts b/apps/server/src/lib/tokens.tsindex 118dd6b7..f1801881 100644--- a/apps/server/src/lib/tokens.ts+++ b/apps/server/src/lib/tokens.ts@@ -1,7 +1,8 @@+import { sha256 } from 'js-sha256';+import { database } from '@/data/database';import { uuid } from '@/lib/utils';import { ColanodeRequestAccount } from '@/types/api';-import { sha256 } from 'js-sha256';interface GenerateTokenResult {token: string;diff --git a/apps/server/src/middlewares/auth.ts b/apps/server/src/middlewares/auth.tsindex 0030f986..6a6087f2 100644--- a/apps/server/src/middlewares/auth.ts+++ b/apps/server/src/middlewares/auth.ts@@ -1,10 +1,10 @@+import { verifyToken } from '@/lib/tokens';import {ApiError,ColanodeNextFunction,ColanodeRequest,ColanodeResponse,} from '@/types/api';-import { verifyToken } from '@/lib/tokens';export const authMiddleware = async (req: ColanodeRequest,diff --git a/apps/server/src/routes/accounts.ts b/apps/server/src/routes/accounts.tsindex bcca7edf..583474a6 100644--- a/apps/server/src/routes/accounts.ts+++ b/apps/server/src/routes/accounts.ts@@ -1,29 +1,30 @@-import { Request, Response, Router } from 'express';import {AccountStatus,+ AccountSyncOutput,AccountUpdateInput,AccountUpdateOutput,EmailLoginInput,EmailRegisterInput,+ generateId,GoogleLoginInput,GoogleUserInfo,+ IdType,LoginOutput,WorkspaceOutput,WorkspaceRole,- generateId,- IdType,- AccountSyncOutput,} from '@colanode/core';import axios from 'axios';-import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';-import { database } from '@/data/database';import bcrypt from 'bcrypt';-import { authMiddleware } from '@/middlewares/auth';-import { generateToken } from '@/lib/tokens';-import { SelectAccount } from '@/data/schema';-import { workspaceService } from '@/services/workspace-service';+import { Request, Response, Router } from 'express';import { sha256 } from 'js-sha256';++import { database } from '@/data/database';+import { SelectAccount } from '@/data/schema';+import { generateToken } from '@/lib/tokens';+import { authMiddleware } from '@/middlewares/auth';import { nodeService } from '@/services/node-service';+import { workspaceService } from '@/services/workspace-service';+import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';const GoogleUserInfoUrl = 'https://www.googleapis.com/oauth2/v1/userinfo';const SaltRounds = 10;@@ -34,7 +35,7 @@ accountsRouter.post('/register/email', async (req: Request, res: Response) => {const input: EmailRegisterInput = req.body;const email = input.email.toLowerCase();- let existingAccount = await database+ const existingAccount = await database.selectFrom('accounts').selectAll().where('email', '=', email)@@ -94,7 +95,7 @@ accountsRouter.post('/login/email', async (req: Request, res: Response) => {const input: EmailLoginInput = req.body;const email = input.email.toLowerCase();- let account = await database+ const account = await database.selectFrom('accounts').where('email', '=', email).selectAll()@@ -159,7 +160,7 @@ accountsRouter.post('/login/google', async (req: Request, res: Response) => {});}- let existingAccount = await database+ const existingAccount = await database.selectFrom('accounts').where('email', '=', googleUser.email).selectAll()diff --git a/apps/server/src/routes/avatars.ts b/apps/server/src/routes/avatars.tsindex 43cdd276..56985f55 100644--- a/apps/server/src/routes/avatars.ts+++ b/apps/server/src/routes/avatars.ts@@ -1,12 +1,13 @@-import { avatarStorage, BUCKET_NAMES } from '@/data/storage';+import { GetObjectCommand,PutObjectCommand } from '@aws-sdk/client-s3';import { generateId, IdType } from '@colanode/core';-import { PutObjectCommand, GetObjectCommand } from '@aws-sdk/client-s3';import { Router } from 'express';import multer from 'multer';-import path from 'path';import sharp from 'sharp';+import path from 'path';import { Readable } from 'stream';+import { avatarStorage, BUCKET_NAMES } from '@/data/storage';+export const avatarsRouter = Router();const storage = multer.memoryStorage();diff --git a/apps/server/src/routes/config.ts b/apps/server/src/routes/config.tsindex eb28fad2..efe14bfe 100644--- a/apps/server/src/routes/config.ts+++ b/apps/server/src/routes/config.ts@@ -1,5 +1,5 @@import { ServerConfig } from '@colanode/core';-import { Router, Request, Response } from 'express';+import { Request, Response,Router } from 'express';export const configRouter = Router();diff --git a/apps/server/src/routes/files.ts b/apps/server/src/routes/files.tsindex 0c5fcc44..d00901f6 100644--- a/apps/server/src/routes/files.ts+++ b/apps/server/src/routes/files.ts@@ -1,15 +1,9 @@-import { database } from '@/data/database';-import { BUCKET_NAMES, filesStorage } from '@/data/storage';-import { hasCollaboratorAccess } from '@/lib/constants';-import { fetchNodeRole } from '@/lib/nodes';-import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';import {GetObjectCommand,HeadObjectCommand,PutObjectCommand,} from '@aws-sdk/client-s3';import { getSignedUrl } from '@aws-sdk/s3-request-presigner';-import { Router } from 'express';import {CreateDownloadOutput,CreateUploadInput,@@ -17,8 +11,15 @@ import {extractFileType,UploadMetadata,} from '@colanode/core';+import { Router } from 'express';++import { database } from '@/data/database';import { redis } from '@/data/redis';+import { BUCKET_NAMES, filesStorage } from '@/data/storage';+import { hasCollaboratorAccess } from '@/lib/constants';+import { fetchNodeRole } from '@/lib/nodes';import { nodeService } from '@/services/node-service';+import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';export const filesRouter = Router();@@ -326,7 +327,7 @@ filesRouter.put(message: 'Uploaded file type does not match expected type',});}- } catch (error) {+ } catch {return res.status(400).json({code: ApiError.BadRequest,message: 'File upload verification failed',diff --git a/apps/server/src/routes/nodes.ts b/apps/server/src/routes/nodes.tsindex 88f16907..8172fe00 100644--- a/apps/server/src/routes/nodes.ts+++ b/apps/server/src/routes/nodes.ts@@ -1,8 +1,9 @@+import { GetNodeTransactionsOutput, hasViewerAccess } from '@colanode/core';+import { Router } from 'express';+import { database } from '@/data/database';import { fetchNodeRole, mapNodeTransaction } from '@/lib/nodes';import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';-import { Router } from 'express';-import { GetNodeTransactionsOutput, hasViewerAccess } from '@colanode/core';export const nodesRouter = Router();diff --git a/apps/server/src/routes/sync.ts b/apps/server/src/routes/sync.tsindex 0e8aae57..95468b39 100644--- a/apps/server/src/routes/sync.ts+++ b/apps/server/src/routes/sync.ts@@ -1,17 +1,18 @@-import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';-import { database } from '@/data/database';-import { Router } from 'express';-import { SelectWorkspaceUser } from '@/data/schema';import {+ LocalCreateNodeTransaction,+ LocalDeleteNodeTransaction,LocalNodeTransaction,+ LocalUpdateNodeTransaction,SyncNodeTransactionResult,SyncNodeTransactionsInput,SyncNodeTransactionStatus,- LocalCreateNodeTransaction,- LocalUpdateNodeTransaction,- LocalDeleteNodeTransaction,} from '@colanode/core';+import { Router } from 'express';++import { database } from '@/data/database';+import { SelectWorkspaceUser } from '@/data/schema';import { nodeService } from '@/services/node-service';+import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';export const syncRouter = Router();diff --git a/apps/server/src/routes/workspaces.ts b/apps/server/src/routes/workspaces.tsindex 50b6d4a2..72c616f8 100644--- a/apps/server/src/routes/workspaces.ts+++ b/apps/server/src/routes/workspaces.ts@@ -1,21 +1,20 @@import {- WorkspaceUsersInviteInput,- WorkspaceUserRoleUpdateInput,- WorkspaceCreateInput,+ AccountStatus,generateId, IdType, WorkspaceCreateInput,WorkspaceOutput,WorkspaceRole,- WorkspaceUserStatus,WorkspaceUpdateInput,WorkspaceUserInviteResult,-} from '@colanode/core';-import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';-import { generateId, IdType, AccountStatus } from '@colanode/core';-import { database } from '@/data/database';+ WorkspaceUserRoleUpdateInput,+ WorkspaceUsersInviteInput,+ WorkspaceUserStatus } from '@colanode/core';import { Router } from 'express';-import { getNameFromEmail } from '@/lib/utils';++import { database } from '@/data/database';import { fetchNode, mapNode, mapNodeTransaction } from '@/lib/nodes';+import { getNameFromEmail } from '@/lib/utils';import { nodeService } from '@/services/node-service';import { workspaceService } from '@/services/workspace-service';+import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';export const workspacesRouter = Router();diff --git a/apps/server/src/services/interaction-service.ts b/apps/server/src/services/interaction-service.tsindex 18ba6888..a4f17994 100644--- a/apps/server/src/services/interaction-service.ts+++ b/apps/server/src/services/interaction-service.ts@@ -1,5 +1,3 @@-import { database } from '@/data/database';-import { eventBus } from '@/lib/event-bus';import {InteractionAttributes,InteractionEvent,@@ -7,6 +5,9 @@ import {SyncInteractionsMessage,} from '@colanode/core';+import { database } from '@/data/database';+import { eventBus } from '@/lib/event-bus';+const UPDATE_RETRIES_COUNT = 10;class InteractionService {diff --git a/apps/server/src/services/job-service.ts b/apps/server/src/services/job-service.tsindex caae1633..422e23ed 100644--- a/apps/server/src/services/job-service.ts+++ b/apps/server/src/services/job-service.ts@@ -1,7 +1,8 @@+import { Job, JobsOptions,Queue, Worker } from 'bullmq';+import { redisConfig } from '@/data/redis';import { jobHandlerMap } from '@/jobs';import { JobHandler, JobInput } from '@/types/jobs';-import { Job, Queue, Worker, JobsOptions } from 'bullmq';class JobService {private jobQueue: Queue | undefined;diff --git a/apps/server/src/services/node-service.ts b/apps/server/src/services/node-service.tsindex c9f1ac51..c11bfdb8 100644--- a/apps/server/src/services/node-service.ts+++ b/apps/server/src/services/node-service.ts@@ -8,6 +8,10 @@ import {registry,} from '@colanode/core';import { decodeState, YDoc } from '@colanode/crdt';+import { sql, Transaction } from 'kysely';+import { cloneDeep } from 'lodash-es';++import { database } from '@/data/database';import {CreateCollaboration,CreateNode,@@ -15,10 +19,9 @@ import {DatabaseSchema,SelectWorkspaceUser,} from '@/data/schema';-import { cloneDeep } from 'lodash-es';-import { mapNode } from '@/lib/nodes';-import { database } from '@/data/database';-import { fetchNodeAncestors } from '@/lib/nodes';+import { eventBus } from '@/lib/event-bus';+import { fetchNodeAncestors, mapNode } from '@/lib/nodes';+import { logService } from '@/services/log-service';import {ApplyNodeCreateTransactionInput,ApplyNodeCreateTransactionOutput,@@ -31,9 +34,6 @@ import {UpdateNodeInput,UpdateNodeOutput,} from '@/types/nodes';-import { eventBus } from '@/lib/event-bus';-import { logService } from '@/services/log-service';-import { sql, Transaction } from 'kysely';const UPDATE_RETRIES_LIMIT = 10;@@ -244,7 +244,7 @@ class NodeService {transaction: createdTransaction,},};- } catch (error) {+ } catch {return { type: 'retry', output: null };}}@@ -503,7 +503,7 @@ class NodeService {transaction: createdTransaction,},};- } catch (error) {+ } catch {return { type: 'retry', output: null };}}diff --git a/apps/server/src/services/synapse-service.ts b/apps/server/src/services/synapse-service.tsindex 60351dd4..381685eb 100644--- a/apps/server/src/services/synapse-service.ts+++ b/apps/server/src/services/synapse-service.ts@@ -1,31 +1,32 @@-import { database } from '@/data/database';-import { Server } from 'http';-import { WebSocketServer, WebSocket } from 'ws';-import { verifyToken } from '@/lib/tokens';import {- InteractionsBatchMessage,CollaborationRevocationsBatchMessage,CollaborationsBatchMessage,+ InteractionsBatchMessage,Message,NodeTransactionsBatchMessage,NodeType,} from '@colanode/core';-import { logService } from '@/services/log-service';-import { interactionService } from '@/services/interaction-service';+import { WebSocket,WebSocketServer } from 'ws';+import { Server } from 'http';++import { database } from '@/data/database';+import { eventBus } from '@/lib/event-bus';import {- mapInteraction,mapCollaboration,mapCollaborationRevocation,+ mapInteraction,mapNodeTransaction,} from '@/lib/nodes';-import { eventBus } from '@/lib/event-bus';+import { verifyToken } from '@/lib/tokens';+import { interactionService } from '@/services/interaction-service';+import { logService } from '@/services/log-service';import {+ CollaboratorAddedEvent,CollaboratorRemovedEvent,InteractionUpdatedEvent,NodeCreatedEvent,- NodeUpdatedEvent,NodeDeletedEvent,- CollaboratorAddedEvent,+ NodeUpdatedEvent,} from '@/types/events';interface SynapseUserCursor {diff --git a/apps/server/src/services/workspace-service.ts b/apps/server/src/services/workspace-service.tsindex 47f88d29..43163a47 100644--- a/apps/server/src/services/workspace-service.ts+++ b/apps/server/src/services/workspace-service.ts@@ -1,4 +1,3 @@-import { database } from '@/data/database';import {generateId,IdType,@@ -7,9 +6,11 @@ import {WorkspaceStatus,WorkspaceUserStatus,} from '@colanode/core';-import { nodeService } from './node-service';-import { mapNode } from '@/lib/nodes';++import { database } from '@/data/database';import { SelectAccount } from '@/data/schema';+import { mapNode } from '@/lib/nodes';+import { nodeService } from '@/services/node-service';class WorkspaceService {public async createWorkspace(diff --git a/apps/server/src/types/api.ts b/apps/server/src/types/api.tsindex 86e53e56..c714b7f5 100644--- a/apps/server/src/types/api.ts+++ b/apps/server/src/types/api.ts@@ -1,4 +1,4 @@-import { Request, Response, NextFunction } from 'express';+import { NextFunction,Request, Response } from 'express';export enum ApiError {GoogleAuthFailed = 'GoogleAuthFailed',diff --git a/apps/server/src/types/jobs.ts b/apps/server/src/types/jobs.tsindex 98dc8bf2..a2435998 100644--- a/apps/server/src/types/jobs.ts+++ b/apps/server/src/types/jobs.ts@@ -1,3 +1,4 @@+// eslint-disable-next-line @typescript-eslint/no-empty-object-typeexport interface JobMap {}export type JobInput = JobMap[keyof JobMap]['input'];diff --git a/apps/server/src/types/nodes.ts b/apps/server/src/types/nodes.tsindex 50b5a22b..b75ced6f 100644--- a/apps/server/src/types/nodes.ts+++ b/apps/server/src/types/nodes.ts@@ -1,6 +1,7 @@-import { SelectNode, SelectNodeTransaction } from '@/data/schema';import { Node, NodeAttributes } from '@colanode/core';+import { SelectNode, SelectNodeTransaction } from '@/data/schema';+export type NodeCollaborator = {nodeId: string;collaboratorId: string;diff --git a/package-lock.json b/package-lock.jsonindex 2f00e449..a3d8006b 100644--- a/package-lock.json+++ b/package-lock.json@@ -18,6 +18,7 @@"@types/lodash-es": "^4.17.12","@typescript-eslint/eslint-plugin": "^8.16.0","eslint": "^8.57.1",+ "eslint-config-prettier": "^9.1.0","eslint-plugin-import": "^2.31.0","eslint-plugin-react": "^7.37.2","prettier": "^3.4.1",@@ -9828,6 +9829,19 @@"url": "https://opencollective.com/eslint"}},+ "node_modules/eslint-config-prettier": {+ "version": "9.1.0",+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",+ "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",+ "dev": true,+ "license": "MIT",+ "bin": {+ "eslint-config-prettier": "bin/cli.js"+ },+ "peerDependencies": {+ "eslint": ">=7.0.0"+ }+ },"node_modules/eslint-import-resolver-node": {"version": "0.3.9","resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",diff --git a/package.json b/package.jsonindex 5f1f0fd9..6569b8ac 100644--- a/package.json+++ b/package.json@@ -28,6 +28,7 @@"@types/lodash-es": "^4.17.12","@typescript-eslint/eslint-plugin": "^8.16.0","eslint": "^8.57.1",+ "eslint-config-prettier": "^9.1.0","eslint-plugin-import": "^2.31.0","eslint-plugin-react": "^7.37.2","prettier": "^3.4.1",diff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex fe678182..68f09798 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -1,8 +1,8 @@export * from './lib/constants';-export * from './lib/id';-export * from './lib/nodes';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';@@ -18,13 +18,13 @@ export * from './registry/page';export * from './registry/record';export * from './registry/space';export * from './registry/user';-export * from './registry/zod';export * from './registry/workspace';-export * from './types/workspaces';-export * from './types/nodes';-export * from './types/sync';+export * from './registry/zod';export * from './types/accounts';-export * from './types/messages';-export * from './types/servers';export * from './types/files';export * from './types/interactions';+export * from './types/messages';+export * from './types/nodes';+export * from './types/servers';+export * from './types/sync';+export * from './types/workspaces';diff --git a/packages/core/src/lib/id.ts b/packages/core/src/lib/id.tsindex d73c2cb3..7e526b72 100644--- a/packages/core/src/lib/id.ts+++ b/packages/core/src/lib/id.ts@@ -1,4 +1,5 @@import { monotonicFactory } from 'ulid';+import { NodeTypes } from './constants';const ulid = monotonicFactory();diff --git a/packages/core/src/lib/interactions.ts b/packages/core/src/lib/interactions.tsindex de6cd0d8..9b2e678f 100644--- a/packages/core/src/lib/interactions.ts+++ b/packages/core/src/lib/interactions.ts@@ -1,8 +1,8 @@+import { compareDate, compareString } from './utils';import {InteractionAttribute,InteractionAttributes,} from '../types/interactions';-import { compareDate, compareString } from './utils';export const mergeInteractionAttributes = (attributes: InteractionAttributes | null | undefined,diff --git a/packages/core/src/lib/nodes.ts b/packages/core/src/lib/nodes.tsindex 3e2fedcd..723cff73 100644--- a/packages/core/src/lib/nodes.ts+++ b/packages/core/src/lib/nodes.ts@@ -1,6 +1,7 @@-import { Node, NodeAttributes, NodeRole } from '../index';import { generateKeyBetween } from 'fractional-indexing-jittered';+import { Node, NodeAttributes, NodeRole } from '../index';+export const extractNodeCollaborators = (attributes: NodeAttributes | NodeAttributes[]): Record<string, NodeRole> => {diff --git a/packages/core/src/registry/block.ts b/packages/core/src/registry/block.tsindex f503b9d2..fa047350 100644--- a/packages/core/src/registry/block.ts+++ b/packages/core/src/registry/block.ts@@ -1,6 +1,7 @@-import { ZodText } from './zod';import { z } from 'zod';+import { ZodText } from './zod';+export const blockLeafSchema = z.object({type: z.string(),text: ZodText.create(),diff --git a/packages/core/src/registry/channel.ts b/packages/core/src/registry/channel.tsindex 16d741a1..be570aee 100644--- a/packages/core/src/registry/channel.ts+++ b/packages/core/src/registry/channel.ts@@ -1,6 +1,7 @@+import { isEqual } from 'lodash-es';import { z } from 'zod';+import { CollaborationModel, NodeModel, nodeRoleEnum } from './core';-import { isEqual } from 'lodash-es';export const channelAttributesSchema = z.object({type: z.literal('channel'),diff --git a/packages/core/src/registry/chat.ts b/packages/core/src/registry/chat.tsindex 30116298..83772696 100644--- a/packages/core/src/registry/chat.ts+++ b/packages/core/src/registry/chat.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import { CollaborationModel, NodeModel, nodeRoleEnum } from './core';export const chatAttributesSchema = z.object({diff --git a/packages/core/src/registry/core.ts b/packages/core/src/registry/core.tsindex 776f95a9..7e34d1cc 100644--- a/packages/core/src/registry/core.ts+++ b/packages/core/src/registry/core.ts@@ -1,5 +1,5 @@import { z, ZodSchema } from 'zod';-import { Node, NodeAttributes } from './';+import {extractNodeRole,hasAdminAccess,@@ -8,6 +8,7 @@ import {hasViewerAccess,} from '../lib/nodes';import { WorkspaceRole } from '../types/workspaces';+import { Node, NodeAttributes } from './';export type NodeRole = 'admin' | 'editor' | 'collaborator' | 'viewer';export const nodeRoleEnum = z.enum([diff --git a/packages/core/src/registry/database.ts b/packages/core/src/registry/database.tsindex 7c9c2d68..78ea9e56 100644--- a/packages/core/src/registry/database.ts+++ b/packages/core/src/registry/database.ts@@ -1,7 +1,8 @@+import { isEqual } from 'lodash-es';import { z } from 'zod';+import { CollaborationModel, NodeModel, nodeRoleEnum } from './core';import { fieldAttributesSchema } from './fields';-import { isEqual } from 'lodash-es';export const viewFieldAttributesSchema = z.object({id: z.string(),diff --git a/packages/core/src/registry/fields.ts b/packages/core/src/registry/fields.tsindex 58ea3bc8..a113676a 100644--- a/packages/core/src/registry/fields.ts+++ b/packages/core/src/registry/fields.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import { ZodText } from './zod';export const selectOptionAttributesSchema = z.object({diff --git a/packages/core/src/registry/file.ts b/packages/core/src/registry/file.tsindex 7ab9f464..bb40faec 100644--- a/packages/core/src/registry/file.ts+++ b/packages/core/src/registry/file.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import { CollaborationModel, NodeModel } from './core';export const fileAttributesSchema = z.object({diff --git a/packages/core/src/registry/folder.ts b/packages/core/src/registry/folder.tsindex 41c6dbff..89a32f67 100644--- a/packages/core/src/registry/folder.ts+++ b/packages/core/src/registry/folder.ts@@ -1,6 +1,7 @@+import { isEqual } from 'lodash-es';import { z } from 'zod';+import { CollaborationModel, NodeModel, nodeRoleEnum } from './core';-import { isEqual } from 'lodash-es';export const folderAttributesSchema = z.object({type: z.literal('folder'),diff --git a/packages/core/src/registry/index.ts b/packages/core/src/registry/index.tsindex bbaa92a9..61690ca9 100644--- a/packages/core/src/registry/index.ts+++ b/packages/core/src/registry/index.ts@@ -4,37 +4,13 @@ import {channelCollaborationModel,channelModel,} from './channel';-import { CollaborationModel, NodeModel } from './core';-import {- PageAttributes,- PageCollaborationAttributes,- pageCollaborationModel,- pageModel,-} from './page';import {ChatAttributes,ChatCollaborationAttributes,chatCollaborationModel,chatModel,} from './chat';-import {- SpaceAttributes,- SpaceCollaborationAttributes,- spaceCollaborationModel,- spaceModel,-} from './space';-import {- UserAttributes,- UserCollaborationAttributes,- userCollaborationModel,- userModel,-} from './user';-import {- MessageAttributes,- MessageCollaborationAttributes,- messageCollaborationModel,- messageModel,-} from './message';+import { CollaborationModel, NodeModel } from './core';import {DatabaseAttributes,DatabaseCollaborationAttributes,@@ -54,11 +30,35 @@ import {folderModel,} from './folder';import {- recordCollaborationModel,+ MessageAttributes,+ MessageCollaborationAttributes,+ messageCollaborationModel,+ messageModel,+} from './message';+import {+ PageAttributes,+ PageCollaborationAttributes,+ pageCollaborationModel,+ pageModel,+} from './page';+import {RecordAttributes,RecordCollaborationAttributes,+ recordCollaborationModel,recordModel,} from './record';+import {+ SpaceAttributes,+ SpaceCollaborationAttributes,+ spaceCollaborationModel,+ spaceModel,+} from './space';+import {+ UserAttributes,+ UserCollaborationAttributes,+ userCollaborationModel,+ userModel,+} from './user';import {WorkspaceAttributes,WorkspaceCollaborationAttributes,diff --git a/packages/core/src/registry/message.ts b/packages/core/src/registry/message.tsindex 0f096d33..b265ff1e 100644--- a/packages/core/src/registry/message.ts+++ b/packages/core/src/registry/message.ts@@ -1,7 +1,8 @@+import { isEqual } from 'lodash-es';import { z } from 'zod';-import { CollaborationModel, NodeModel } from './core';+import { blockSchema } from './block';-import { isEqual } from 'lodash-es';+import { CollaborationModel, NodeModel } from './core';const standardMessageAttributesSchema = z.object({type: z.literal('message'),diff --git a/packages/core/src/registry/page.ts b/packages/core/src/registry/page.tsindex 1692580c..ff4d944f 100644--- a/packages/core/src/registry/page.ts+++ b/packages/core/src/registry/page.ts@@ -1,7 +1,8 @@+import { isEqual } from 'lodash-es';import { z } from 'zod';-import { CollaborationModel, NodeModel, nodeRoleEnum } from './core';+import { blockSchema } from './block';-import { isEqual } from 'lodash-es';+import { CollaborationModel, NodeModel, nodeRoleEnum } from './core';export const pageAttributesSchema = z.object({type: z.literal('page'),diff --git a/packages/core/src/registry/record.ts b/packages/core/src/registry/record.tsindex 55ebc42f..09c19f85 100644--- a/packages/core/src/registry/record.ts+++ b/packages/core/src/registry/record.ts@@ -1,7 +1,8 @@import { z } from 'zod';++import { blockSchema } from './block';import { CollaborationModel, NodeModel } from './core';import { fieldValueSchema } from './fields';-import { blockSchema } from './block';export const recordAttributesSchema = z.object({type: z.literal('record'),diff --git a/packages/core/src/registry/space.ts b/packages/core/src/registry/space.tsindex 545ee376..c2864095 100644--- a/packages/core/src/registry/space.ts+++ b/packages/core/src/registry/space.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import { CollaborationModel, NodeModel, nodeRoleEnum } from './core';export const spaceAttributesSchema = z.object({diff --git a/packages/core/src/registry/user.ts b/packages/core/src/registry/user.tsindex 75382029..d415ae49 100644--- a/packages/core/src/registry/user.ts+++ b/packages/core/src/registry/user.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import { CollaborationModel, NodeModel } from './core';export const userAttributesSchema = z.object({diff --git a/packages/core/src/registry/workspace.ts b/packages/core/src/registry/workspace.tsindex 23655fc3..13578a7c 100644--- a/packages/core/src/registry/workspace.ts+++ b/packages/core/src/registry/workspace.ts@@ -1,4 +1,5 @@import { z } from 'zod';+import { CollaborationModel, NodeModel } from './core';export const workspaceAttributesSchema = z.object({diff --git a/packages/core/src/registry/zod.ts b/packages/core/src/registry/zod.tsindex 1b87d3bb..5869df9a 100644--- a/packages/core/src/registry/zod.ts+++ b/packages/core/src/registry/zod.ts@@ -1,10 +1,10 @@import {- ZodType,- ZodTypeDef,- ParseInput,- ParseReturnType,INVALID,OK,+ ParseInput,+ ParseReturnType,+ ZodType,+ ZodTypeDef,} from 'zod';export class ZodText extends ZodType<string, ZodTypeDef, string> {diff --git a/packages/core/src/types/messages.ts b/packages/core/src/types/messages.tsindex b871f2f4..5169a0a0 100644--- a/packages/core/src/types/messages.ts+++ b/packages/core/src/types/messages.ts@@ -1,11 +1,11 @@-import { NodeType } from '../registry';+import { InteractionEvent } from './interactions';import {- ServerInteraction,ServerCollaboration,ServerCollaborationRevocation,+ ServerInteraction,ServerNodeTransaction,} from './sync';-import { InteractionEvent } from './interactions';+import { NodeType } from '../registry';export type FetchNodeTransactionsMessage = {type: 'fetch_node_transactions';diff --git a/packages/core/src/types/nodes.ts b/packages/core/src/types/nodes.tsindex dee35c21..eb6a2918 100644--- a/packages/core/src/types/nodes.ts+++ b/packages/core/src/types/nodes.ts@@ -1,5 +1,5 @@-import { NodeAttributes } from '../registry';import { ServerNodeTransaction } from './sync';+import { NodeAttributes } from '../registry';export type NodeOutput = {id: string;diff --git a/packages/core/src/types/sync.ts b/packages/core/src/types/sync.tsindex 312411fe..98382fc3 100644--- a/packages/core/src/types/sync.ts+++ b/packages/core/src/types/sync.ts@@ -1,6 +1,6 @@-import { NodeRole } from '../registry/core';import { InteractionAttributes } from './interactions';import { NodeType } from '../registry';+import { NodeRole } from '../registry/core';export type SyncNodeTransactionsInput = {transactions: LocalNodeTransaction[];diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.tsindex 979ec7de..92fe4ec5 100644--- a/packages/crdt/src/index.ts+++ b/packages/crdt/src/index.ts@@ -1,10 +1,10 @@/* eslint-disable @typescript-eslint/no-explicit-any */-import { z, ZodSchema } from 'zod';-import * as Y from 'yjs';import { ZodText } from '@colanode/core';-import { isEqual } from 'lodash-es';import { diffChars } from 'diff';import { fromUint8Array, toUint8Array } from 'js-base64';+import { isEqual } from 'lodash-es';+import * as Y from 'yjs';+import { z, ZodSchema } from 'zod';export const encodeState = (state: Uint8Array) => {return fromUint8Array(state);diff --git a/scripts/src/emojis/index.ts b/scripts/src/emojis/index.tsindex 019521f6..b5282553 100644--- a/scripts/src/emojis/index.ts+++ b/scripts/src/emojis/index.ts@@ -1,8 +1,8 @@-import fs from 'fs';import archiver from 'archiver';-import unzipper from 'unzipper';import fetch from 'node-fetch';import { monotonicFactory } from 'ulid';+import unzipper from 'unzipper';+import fs from 'fs';const ulid = monotonicFactory();diff --git a/scripts/src/icons/index.ts b/scripts/src/icons/index.tsindex 913cf277..1d69ab5e 100644--- a/scripts/src/icons/index.ts+++ b/scripts/src/icons/index.ts@@ -1,8 +1,8 @@-import fs from 'fs';import archiver from 'archiver';-import unzipper from 'unzipper';import fetch from 'node-fetch';import { monotonicFactory } from 'ulid';+import unzipper from 'unzipper';+import fs from 'fs';const ulid = monotonicFactory();