Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Use tabs for containers

Hakan Shehud02e2061ec00
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 285eafcb..12bd2612 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -95,7 +95,7 @@
"lowlight": "^3.2.0",
"lucide-react": "^0.473.0",
"mime-types": "^2.1.35",
- "re-resizable": "^6.10.1",
+ "re-resizable": "^6.10.3",
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dnd": "^16.0.1",
diff --git a/apps/desktop/src/main/databases/workspace/migrations/00016-create-metadata-table.tsx b/apps/desktop/src/main/databases/workspace/migrations/00016-create-metadata-table.tsx
new file mode 100644
index 00000000..e7424d2f
--- /dev/null
+++ b/apps/desktop/src/main/databases/workspace/migrations/00016-create-metadata-table.tsx
@@ -0,0 +1,16 @@
+import { Migration } from 'kysely';
+
+export const createMetadataTable: Migration = {
+ up: async (db) => {
+ await db.schema
+ .createTable('metadata')
+ .addColumn('key', 'text', (col) => col.notNull().primaryKey())
+ .addColumn('value', 'text', (col) => col.notNull())
+ .addColumn('created_at', 'text', (col) => col.notNull())
+ .addColumn('updated_at', 'text')
+ .execute();
+ },
+ down: async (db) => {
+ await db.schema.dropTable('metadata').execute();
+ },
+};
diff --git a/apps/desktop/src/main/databases/workspace/migrations/index.ts b/apps/desktop/src/main/databases/workspace/migrations/index.ts
index 77f56ee9..87fb43e9 100644
--- a/apps/desktop/src/main/databases/workspace/migrations/index.ts
+++ b/apps/desktop/src/main/databases/workspace/migrations/index.ts
@@ -15,6 +15,7 @@ import { createMutationsTable } from './00012-create-mutations-table';
import { createEntryPathsTable } from './00013-create-entry-paths-table';
import { createTextsTable } from './00014-create-texts-table';
import { createCursorsTable } from './00015-create-cursors-table';
+import { createMetadataTable } from './00016-create-metadata-table';
export const workspaceDatabaseMigrations: Record<string, Migration> = {
'00001-create-users-table': createUsersTable,
@@ -32,4 +33,5 @@ export const workspaceDatabaseMigrations: Record<string, Migration> = {
'00013-create-entry-paths-table': createEntryPathsTable,
'00014-create-texts-table': createTextsTable,
'00015-create-cursors-table': createCursorsTable,
+ '00016-create-metadata-table': createMetadataTable,
};
diff --git a/apps/desktop/src/main/databases/workspace/schema.ts b/apps/desktop/src/main/databases/workspace/schema.ts
index 632d5169..268f6c4a 100644
--- a/apps/desktop/src/main/databases/workspace/schema.ts
+++ b/apps/desktop/src/main/databases/workspace/schema.ts
@@ -231,6 +231,21 @@ interface CursorTable {
updated_at: ColumnType<string | null, string | null, string | null>;
}
+export type SelectCursor = Selectable<CursorTable>;
+export type CreateCursor = Insertable<CursorTable>;
+export type UpdateCursor = Updateable<CursorTable>;
+
+interface MetadataTable {
+ key: ColumnType<string, string, never>;
+ value: ColumnType<string, string, string>;
+ created_at: ColumnType<string, string, never>;
+ updated_at: ColumnType<string | null, string | null, string | null>;
+}
+
+export type SelectWorkspaceMetadata = Selectable<MetadataTable>;
+export type CreateWorkspaceMetadata = Insertable<MetadataTable>;
+export type UpdateWorkspaceMetadata = Updateable<MetadataTable>;
+
export interface WorkspaceDatabaseSchema {
users: UserTable;
entries: EntryTable;
@@ -247,4 +262,5 @@ export interface WorkspaceDatabaseSchema {
mutations: MutationTable;
texts: TextTable;
cursors: CursorTable;
+ metadata: MetadataTable;
}
diff --git a/apps/desktop/src/main/lib/mappers.ts b/apps/desktop/src/main/lib/mappers.ts
index a182ab77..d8cb434b 100644
--- a/apps/desktop/src/main/lib/mappers.ts
+++ b/apps/desktop/src/main/lib/mappers.ts
@@ -22,12 +22,17 @@ import {
SelectMessageInteraction,
SelectFileInteraction,
SelectEntryInteraction,
+ SelectWorkspaceMetadata,
} from '@/main/databases/workspace';
import { Account } from '@/shared/types/accounts';
import { Server } from '@/shared/types/servers';
import { User } from '@/shared/types/users';
import { File, FileInteraction, FileState } from '@/shared/types/files';
-import { Workspace } from '@/shared/types/workspaces';
+import {
+ Workspace,
+ WorkspaceMetadata,
+ WorkspaceMetadataKey,
+} from '@/shared/types/workspaces';
import {
MessageInteraction,
MessageNode,
@@ -285,3 +290,14 @@ export const mapIcon = (row: SelectIcon): Icon => {
tags: row.tags ? JSON.parse(row.tags) : [],
};
};
+
+export const mapWorkspaceMetadata = (
+ row: SelectWorkspaceMetadata
+): WorkspaceMetadata => {
+ return {
+ key: row.key as WorkspaceMetadataKey,
+ value: JSON.parse(row.value),
+ createdAt: row.created_at,
+ updatedAt: row.updated_at,
+ };
+};
diff --git a/apps/desktop/src/main/lib/utils.ts b/apps/desktop/src/main/lib/utils.ts
index fea66fea..a39026d6 100644
--- a/apps/desktop/src/main/lib/utils.ts
+++ b/apps/desktop/src/main/lib/utils.ts
@@ -1,4 +1,4 @@
-import { extractFileType } from '@colanode/core';
+import { extractFileType, getIdType, IdType } from '@colanode/core';
import {
DeleteResult,
InsertResult,
@@ -159,3 +159,76 @@ export const fetchUserStorageUsed = async (
return BigInt(storageUsedRow?.storage_used ?? 0);
};
+
+export const fetchEntryBreadcrumb = async (
+ database: Kysely<WorkspaceDatabaseSchema>,
+ entryId: string
+): Promise<string[]> => {
+ const rows = await database
+ .selectFrom('entry_paths')
+ .select('ancestor_id')
+ .where('descendant_id', '=', entryId)
+ .orderBy('level', 'asc')
+ .execute();
+
+ return rows.map((row) => row.ancestor_id);
+};
+
+export const fetchMessageBreadcrumb = async (
+ database: Kysely<WorkspaceDatabaseSchema>,
+ messageId: string
+): Promise<string[]> => {
+ const message = await database
+ .selectFrom('messages')
+ .select('parent_id')
+ .where('id', '=', messageId)
+ .executeTakeFirst();
+
+ if (!message) {
+ return [];
+ }
+
+ const parentIdType = getIdType(message.parent_id);
+ if (parentIdType === IdType.Message) {
+ const messageBreadcrumb = await fetchMessageBreadcrumb(
+ database,
+ message.parent_id
+ );
+
+ return [...messageBreadcrumb, messageId];
+ }
+
+ const entryBreadcrumb = await fetchEntryBreadcrumb(
+ database,
+ message.parent_id
+ );
+ return [...entryBreadcrumb, messageId];
+};
+
+export const fetchFileBreadcrumb = async (
+ database: Kysely<WorkspaceDatabaseSchema>,
+ fileId: string
+): Promise<string[]> => {
+ const file = await database
+ .selectFrom('files')
+ .select('parent_id')
+ .where('id', '=', fileId)
+ .executeTakeFirst();
+
+ if (!file) {
+ return [];
+ }
+
+ const parentIdType = getIdType(file.parent_id);
+ if (parentIdType === IdType.Message) {
+ const messageBreadcrumb = await fetchMessageBreadcrumb(
+ database,
+ file.parent_id
+ );
+
+ return [...messageBreadcrumb, fileId];
+ }
+
+ const entryBreadcrumb = await fetchEntryBreadcrumb(database, file.parent_id);
+ return [...entryBreadcrumb, fileId];
+};
diff --git a/apps/desktop/src/main/mutations/index.ts b/apps/desktop/src/main/mutations/index.ts
index 9013cd83..4ad2b1b7 100644
--- a/apps/desktop/src/main/mutations/index.ts
+++ b/apps/desktop/src/main/mutations/index.ts
@@ -59,6 +59,8 @@ import { WorkspaceCreateMutationHandler } from '@/main/mutations/workspaces/work
import { WorkspaceUpdateMutationHandler } from '@/main/mutations/workspaces/workspace-update';
import { UserRoleUpdateMutationHandler } from '@/main/mutations/users/user-role-update';
import { UsersInviteMutationHandler } from '@/main/mutations/users/users-invite';
+import { WorkspaceMetadataSaveMutationHandler } from '@/main/mutations/workspaces/workspace-metadata-save';
+import { WorkspaceMetadataDeleteMutationHandler } from '@/main/mutations/workspaces/workspace-metadata-delete';
import { MutationHandler } from '@/main/lib/types';
import { MutationMap } from '@/shared/mutations';
@@ -128,4 +130,6 @@ export const mutationHandlerMap: MutationHandlerMap = {
page_update: new PageUpdateMutationHandler(),
folder_update: new FolderUpdateMutationHandler(),
database_update: new DatabaseUpdateMutationHandler(),
+ workspace_metadata_save: new WorkspaceMetadataSaveMutationHandler(),
+ workspace_metadata_delete: new WorkspaceMetadataDeleteMutationHandler(),
};
diff --git a/apps/desktop/src/main/mutations/workspaces/workspace-metadata-delete.ts b/apps/desktop/src/main/mutations/workspaces/workspace-metadata-delete.ts
new file mode 100644
index 00000000..33671360
--- /dev/null
+++ b/apps/desktop/src/main/mutations/workspaces/workspace-metadata-delete.ts
@@ -0,0 +1,41 @@
+import { MutationHandler } from '@/main/lib/types';
+import {
+ WorkspaceMetadataDeleteMutationInput,
+ WorkspaceMetadataDeleteMutationOutput,
+} from '@/shared/mutations/workspaces/workspace-metadata-delete';
+import { WorkspaceMutationHandlerBase } from '@/main/mutations/workspace-mutation-handler-base';
+import { eventBus } from '@/shared/lib/event-bus';
+import { mapWorkspaceMetadata } from '@/main/lib/mappers';
+
+export class WorkspaceMetadataDeleteMutationHandler
+ extends WorkspaceMutationHandlerBase
+ implements MutationHandler<WorkspaceMetadataDeleteMutationInput>
+{
+ async handleMutation(
+ input: WorkspaceMetadataDeleteMutationInput
+ ): Promise<WorkspaceMetadataDeleteMutationOutput> {
+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);
+ const deletedMetadata = await workspace.database
+ .deleteFrom('metadata')
+ .where('key', '=', input.key)
+ .returningAll()
+ .executeTakeFirst();
+
+ if (!deletedMetadata) {
+ return {
+ success: true,
+ };
+ }
+
+ eventBus.publish({
+ type: 'workspace_metadata_deleted',
+ accountId: input.accountId,
+ workspaceId: input.workspaceId,
+ metadata: mapWorkspaceMetadata(deletedMetadata),
+ });
+
+ return {
+ success: true,
+ };
+ }
+}
diff --git a/apps/desktop/src/main/mutations/workspaces/workspace-metadata-save.ts b/apps/desktop/src/main/mutations/workspaces/workspace-metadata-save.ts
new file mode 100644
index 00000000..9bf13099
--- /dev/null
+++ b/apps/desktop/src/main/mutations/workspaces/workspace-metadata-save.ts
@@ -0,0 +1,51 @@
+import { MutationHandler } from '@/main/lib/types';
+import {
+ WorkspaceMetadataSaveMutationInput,
+ WorkspaceMetadataSaveMutationOutput,
+} from '@/shared/mutations/workspaces/workspace-metadata-save';
+import { WorkspaceMutationHandlerBase } from '@/main/mutations/workspace-mutation-handler-base';
+import { eventBus } from '@/shared/lib/event-bus';
+import { mapWorkspaceMetadata } from '@/main/lib/mappers';
+
+export class WorkspaceMetadataSaveMutationHandler
+ extends WorkspaceMutationHandlerBase
+ implements MutationHandler<WorkspaceMetadataSaveMutationInput>
+{
+ async handleMutation(
+ input: WorkspaceMetadataSaveMutationInput
+ ): Promise<WorkspaceMetadataSaveMutationOutput> {
+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);
+ const createdMetadata = await workspace.database
+ .insertInto('metadata')
+ .returningAll()
+ .values({
+ key: input.key,
+ value: input.value,
+ created_at: new Date().toISOString(),
+ })
+ .onConflict((cb) =>
+ cb.columns(['key']).doUpdateSet({
+ value: input.value,
+ updated_at: new Date().toISOString(),
+ })
+ )
+ .executeTakeFirst();
+
+ if (!createdMetadata) {
+ return {
+ success: false,
+ };
+ }
+
+ eventBus.publish({
+ type: 'workspace_metadata_updated',
+ accountId: input.accountId,
+ workspaceId: input.workspaceId,
+ metadata: mapWorkspaceMetadata(createdMetadata),
+ });
+
+ return {
+ success: true,
+ };
+ }
+}
diff --git a/apps/desktop/src/main/queries/entries/entry-breadcrumb-get.ts b/apps/desktop/src/main/queries/entries/entry-breadcrumb-get.ts
new file mode 100644
index 00000000..2ca8ec67
--- /dev/null
+++ b/apps/desktop/src/main/queries/entries/entry-breadcrumb-get.ts
@@ -0,0 +1,67 @@
+import { ChangeCheckResult, QueryHandler } from '@/main/lib/types';
+import { fetchEntryBreadcrumb } from '@/main/lib/utils';
+import { EntryBreadcrumbGetQueryInput } from '@/shared/queries/entries/entry-breadcrumb-get';
+import { Event } from '@/shared/types/events';
+import { WorkspaceQueryHandlerBase } from '@/main/queries/workspace-query-handler-base';
+
+export class EntryBreadcrumbGetQueryHandler
+ extends WorkspaceQueryHandlerBase
+ implements QueryHandler<EntryBreadcrumbGetQueryInput>
+{
+ public async handleQuery(
+ input: EntryBreadcrumbGetQueryInput
+ ): Promise<string[]> {
+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);
+ return fetchEntryBreadcrumb(workspace.database, input.entryId);
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: EntryBreadcrumbGetQueryInput,
+ output: string[]
+ ): Promise<ChangeCheckResult<EntryBreadcrumbGetQueryInput>> {
+ if (
+ event.type === 'workspace_deleted' &&
+ event.workspace.accountId === input.accountId &&
+ event.workspace.id === input.workspaceId
+ ) {
+ return {
+ hasChanges: true,
+ result: [],
+ };
+ }
+
+ if (
+ event.type === 'entry_created' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.entry.id === input.entryId
+ ) {
+ const newResult = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newResult,
+ };
+ }
+
+ if (
+ event.type === 'entry_deleted' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId
+ ) {
+ const entryId = output.find((id) => id === event.entry.id);
+ if (entryId) {
+ const newResult = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newResult,
+ };
+ }
+ }
+
+ return {
+ hasChanges: false,
+ result: output,
+ };
+ }
+}
diff --git a/apps/desktop/src/main/queries/files/file-breadcrumb-get.ts b/apps/desktop/src/main/queries/files/file-breadcrumb-get.ts
new file mode 100644
index 00000000..7b68be35
--- /dev/null
+++ b/apps/desktop/src/main/queries/files/file-breadcrumb-get.ts
@@ -0,0 +1,67 @@
+import { ChangeCheckResult, QueryHandler } from '@/main/lib/types';
+import { FileBreadcrumbGetQueryInput } from '@/shared/queries/files/file-breadcrumb-get';
+import { Event } from '@/shared/types/events';
+import { WorkspaceQueryHandlerBase } from '@/main/queries/workspace-query-handler-base';
+import { fetchFileBreadcrumb } from '@/main/lib/utils';
+
+export class FileBreadcrumbGetQueryHandler
+ extends WorkspaceQueryHandlerBase
+ implements QueryHandler<FileBreadcrumbGetQueryInput>
+{
+ public async handleQuery(
+ input: FileBreadcrumbGetQueryInput
+ ): Promise<string[]> {
+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);
+ return fetchFileBreadcrumb(workspace.database, input.fileId);
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: FileBreadcrumbGetQueryInput,
+ output: string[]
+ ): Promise<ChangeCheckResult<FileBreadcrumbGetQueryInput>> {
+ if (
+ event.type === 'workspace_deleted' &&
+ event.workspace.accountId === input.accountId &&
+ event.workspace.id === input.workspaceId
+ ) {
+ return {
+ hasChanges: true,
+ result: [],
+ };
+ }
+
+ if (
+ event.type === 'file_created' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.file.id === input.fileId
+ ) {
+ const newOutput = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newOutput,
+ };
+ }
+
+ if (
+ event.type === 'file_deleted' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.file.id === input.fileId
+ ) {
+ const fileId = output.find((id) => id === event.file.id);
+ if (fileId) {
+ const newOutput = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newOutput,
+ };
+ }
+ }
+
+ return {
+ hasChanges: false,
+ };
+ }
+}
diff --git a/apps/desktop/src/main/queries/index.ts b/apps/desktop/src/main/queries/index.ts
index 551f0698..16db2cac 100644
--- a/apps/desktop/src/main/queries/index.ts
+++ b/apps/desktop/src/main/queries/index.ts
@@ -8,6 +8,7 @@ import { EmojiGetBySkinIdQueryHandler } from '@/main/queries/emojis/emoji-get-by
import { FileListQueryHandler } from '@/main/queries/files/file-list';
import { FileGetQueryHandler } from '@/main/queries/files/file-get';
import { FileMetadataGetQueryHandler } from '@/main/queries/files/file-metadata-get';
+import { FileBreadcrumbGetQueryHandler } from '@/main/queries/files/file-breadcrumb-get';
import { IconListQueryHandler } from '@/main/queries/icons/icon-list';
import { IconSearchQueryHandler } from '@/main/queries/icons/icon-search';
import { IconCategoryListQueryHandler } from '@/main/queries/icons/icon-category-list';
@@ -15,9 +16,11 @@ import { MessageGetQueryHandler } from '@/main/queries/messages/message-get';
import { MessageListQueryHandler } from '@/main/queries/messages/message-list';
import { MessageReactionsListQueryHandler } from '@/main/queries/messages/message-reaction-list';
import { MessageReactionsAggregateQueryHandler } from '@/main/queries/messages/message-reactions-aggregate';
+import { MessageBreadcrumbGetQueryHandler } from '@/main/queries/messages/message-breadcrumb-get';
import { EntryChildrenGetQueryHandler } from '@/main/queries/entries/entry-children-get';
import { EntryGetQueryHandler } from '@/main/queries/entries/entry-get';
import { EntryTreeGetQueryHandler } from '@/main/queries/entries/entry-tree-get';
+import { EntryBreadcrumbGetQueryHandler } from '@/main/queries/entries/entry-breadcrumb-get';
import { RadarDataGetQueryHandler } from '@/main/queries/interactions/radar-data-get';
import { RecordListQueryHandler } from '@/main/queries/records/record-list';
import { ServerListQueryHandler } from '@/main/queries/servers/server-list';
@@ -30,6 +33,7 @@ import { RecordSearchQueryHandler } from '@/main/queries/records/record-search';
import { UserGetQueryHandler } from '@/main/queries/users/user-get';
import { SpaceListQueryHandler } from '@/main/queries/spaces/space-list';
import { ChatListQueryHandler } from '@/main/queries/chats/chat-list';
+import { WorkspaceMetadataListQueryHandler } from '@/main/queries/workspaces/workspace-metadata-list';
import { QueryHandler } from '@/main/lib/types';
import { QueryMap } from '@/shared/queries';
@@ -43,7 +47,9 @@ export const queryHandlerMap: QueryHandlerMap = {
message_reaction_list: new MessageReactionsListQueryHandler(),
message_reactions_aggregate: new MessageReactionsAggregateQueryHandler(),
message_get: new MessageGetQueryHandler(),
+ message_breadcrumb_get: new MessageBreadcrumbGetQueryHandler(),
entry_get: new EntryGetQueryHandler(),
+ entry_breadcrumb_get: new EntryBreadcrumbGetQueryHandler(),
record_list: new RecordListQueryHandler(),
server_list: new ServerListQueryHandler(),
user_search: new UserSearchQueryHandler(),
@@ -62,6 +68,7 @@ export const queryHandlerMap: QueryHandlerMap = {
entry_children_get: new EntryChildrenGetQueryHandler(),
radar_data_get: new RadarDataGetQueryHandler(),
file_metadata_get: new FileMetadataGetQueryHandler(),
+ file_breadcrumb_get: new FileBreadcrumbGetQueryHandler(),
account_get: new AccountGetQueryHandler(),
workspace_get: new WorkspaceGetQueryHandler(),
database_list: new DatabaseListQueryHandler(),
@@ -70,4 +77,5 @@ export const queryHandlerMap: QueryHandlerMap = {
file_get: new FileGetQueryHandler(),
chat_list: new ChatListQueryHandler(),
space_list: new SpaceListQueryHandler(),
+ workspace_metadata_list: new WorkspaceMetadataListQueryHandler(),
};
diff --git a/apps/desktop/src/main/queries/messages/message-breadcrumb-get.ts b/apps/desktop/src/main/queries/messages/message-breadcrumb-get.ts
new file mode 100644
index 00000000..aa431917
--- /dev/null
+++ b/apps/desktop/src/main/queries/messages/message-breadcrumb-get.ts
@@ -0,0 +1,67 @@
+import { ChangeCheckResult, QueryHandler } from '@/main/lib/types';
+import { MessageBreadcrumbGetQueryInput } from '@/shared/queries/messages/message-breadcrumb-get';
+import { Event } from '@/shared/types/events';
+import { WorkspaceQueryHandlerBase } from '@/main/queries/workspace-query-handler-base';
+import { fetchMessageBreadcrumb } from '@/main/lib/utils';
+
+export class MessageBreadcrumbGetQueryHandler
+ extends WorkspaceQueryHandlerBase
+ implements QueryHandler<MessageBreadcrumbGetQueryInput>
+{
+ public async handleQuery(
+ input: MessageBreadcrumbGetQueryInput
+ ): Promise<string[]> {
+ const workspace = this.getWorkspace(input.accountId, input.workspaceId);
+ return fetchMessageBreadcrumb(workspace.database, input.messageId);
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: MessageBreadcrumbGetQueryInput,
+ output: string[]
+ ): Promise<ChangeCheckResult<MessageBreadcrumbGetQueryInput>> {
+ if (
+ event.type === 'workspace_deleted' &&
+ event.workspace.accountId === input.accountId &&
+ event.workspace.id === input.workspaceId
+ ) {
+ return {
+ hasChanges: true,
+ result: [],
+ };
+ }
+
+ if (
+ event.type === 'message_created' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.message.id === input.messageId
+ ) {
+ const newOutput = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newOutput,
+ };
+ }
+
+ if (
+ event.type === 'message_deleted' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId &&
+ event.message.id === input.messageId
+ ) {
+ const messageId = output.find((id) => id === event.message.id);
+ if (messageId) {
+ const newOutput = await this.handleQuery(input);
+ return {
+ hasChanges: true,
+ result: newOutput,
+ };
+ }
+ }
+
+ return {
+ hasChanges: false,
+ };
+ }
+}
diff --git a/apps/desktop/src/main/queries/workspaces/workspace-metadata-list.ts b/apps/desktop/src/main/queries/workspaces/workspace-metadata-list.ts
new file mode 100644
index 00000000..0528cee2
--- /dev/null
+++ b/apps/desktop/src/main/queries/workspaces/workspace-metadata-list.ts
@@ -0,0 +1,93 @@
+import { ChangeCheckResult, QueryHandler } from '@/main/lib/types';
+import { mapWorkspaceMetadata } from '@/main/lib/mappers';
+import { WorkspaceMetadataListQueryInput } from '@/shared/queries/workspaces/workspace-metadata-list';
+import { Event } from '@/shared/types/events';
+import { WorkspaceMetadata } from '@/shared/types/workspaces';
+import { WorkspaceQueryHandlerBase } from '@/main/queries/workspace-query-handler-base';
+import { SelectWorkspaceMetadata } from '@/main/databases/workspace/schema';
+
+export class WorkspaceMetadataListQueryHandler
+ extends WorkspaceQueryHandlerBase
+ implements QueryHandler<WorkspaceMetadataListQueryInput>
+{
+ public async handleQuery(
+ input: WorkspaceMetadataListQueryInput
+ ): Promise<WorkspaceMetadata[]> {
+ const rows = await this.getWorkspaceMetadata(
+ input.accountId,
+ input.workspaceId
+ );
+ if (!rows) {
+ return [];
+ }
+
+ return rows.map(mapWorkspaceMetadata);
+ }
+
+ public async checkForChanges(
+ event: Event,
+ input: WorkspaceMetadataListQueryInput,
+ output: WorkspaceMetadata[]
+ ): Promise<ChangeCheckResult<WorkspaceMetadataListQueryInput>> {
+ if (
+ event.type === 'workspace_created' &&
+ event.workspace.accountId === input.accountId &&
+ event.workspace.id === input.workspaceId
+ ) {
+ return {
+ hasChanges: true,
+ result: [],
+ };
+ }
+
+ if (
+ event.type === 'workspace_metadata_updated' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId
+ ) {
+ const newOutput = output.map((metadata) => {
+ if (metadata.key === event.metadata.key) {
+ return event.metadata;
+ }
+ return metadata;
+ });
+
+ return {
+ hasChanges: true,
+ result: newOutput,
+ };
+ }
+
+ if (
+ event.type === 'workspace_metadata_deleted' &&
+ event.accountId === input.accountId &&
+ event.workspaceId === input.workspaceId
+ ) {
+ const newOutput = output.filter(
+ (metadata) => metadata.key !== event.metadata.key
+ );
+
+ return {
+ hasChanges: true,
+ result: newOutput,
+ };
+ }
+
+ return {
+ hasChanges: false,
+ };
+ }
+
+ private async getWorkspaceMetadata(
+ accountId: string,
+ workspaceId: string
+ ): Promise<SelectWorkspaceMetadata[] | undefined> {
+ const workspace = this.getWorkspace(accountId, workspaceId);
+ const rows = await workspace.database
+ .selectFrom('metadata')
+ .selectAll()
+ .execute();
+
+ return rows;
+ }
+}
diff --git a/apps/desktop/src/renderer/components/channels/channel-body.tsx b/apps/desktop/src/renderer/components/channels/channel-body.tsx
deleted file mode 100644
index dd1b85d6..00000000
--- a/apps/desktop/src/renderer/components/channels/channel-body.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { ChannelEntry, EntryRole } from '@colanode/core';
-import { useEffect } from 'react';
-
-import { Conversation } from '@/renderer/components/messages/conversation';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useRadar } from '@/renderer/contexts/radar';
-
-interface ChannelBodyProps {
- channel: ChannelEntry;
- role: EntryRole;
-}
-
-export const ChannelBody = ({ channel, role }: ChannelBodyProps) => {
- const workspace = useWorkspace();
- const radar = useRadar();
-
- useEffect(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, channel.id);
-
- const interval = setInterval(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, channel.id);
- }, 60000);
-
- return () => clearInterval(interval);
- }, [channel.id, channel.type, channel.transactionId]);
-
- return (
- <Conversation
- conversationId={channel.id}
- rootId={channel.rootId}
- role={role}
- />
- );
-};
diff --git a/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx
index ef4e589d..97887fec 100644
--- a/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx
@@ -1,21 +1,35 @@
import { ChannelEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface ChannelBreadcrumbItemProps {
- channel: ChannelEntry;
+ id: string;
}
-export const ChannelBreadcrumbItem = ({
- channel,
-}: ChannelBreadcrumbItemProps) => {
+export const ChannelBreadcrumbItem = ({ id }: ChannelBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ if (!data) {
+ return null;
+ }
+
+ const channel = data as ChannelEntry;
+
return (
<div className="flex items-center space-x-2">
<Avatar
- size="small"
id={channel.id}
name={channel.attributes.name}
avatar={channel.attributes.avatar}
+ className="size-4"
/>
<span>{channel.attributes.name}</span>
</div>
diff --git a/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx b/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx
new file mode 100644
index 00000000..a092ebc3
--- /dev/null
+++ b/apps/desktop/src/renderer/components/channels/channel-container-tab.tsx
@@ -0,0 +1,39 @@
+import { ChannelEntry } from '@colanode/core';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface ChannelContainerTabProps {
+ channelId: string;
+}
+
+export const ChannelContainerTab = ({
+ channelId,
+}: ChannelContainerTabProps) => {
+ const workspace = useWorkspace();
+
+ const { data: entry } = useQuery({
+ type: 'entry_get',
+ entryId: channelId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const channel = entry as ChannelEntry;
+ if (!channel) {
+ return <p>Not found</p>;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={channel.id}
+ name={channel.attributes.name}
+ avatar={channel.attributes.avatar}
+ />
+ <span>{channel.attributes.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/channels/channel-container.tsx b/apps/desktop/src/renderer/components/channels/channel-container.tsx
index beea9b27..396f2f39 100644
--- a/apps/desktop/src/renderer/components/channels/channel-container.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-container.tsx
@@ -1,57 +1,52 @@
-import { ChannelEntry, extractEntryRole } from '@colanode/core';
+import { ChannelEntry } from '@colanode/core';
-import { ChannelBody } from '@/renderer/components/channels/channel-body';
-import { ChannelHeader } from '@/renderer/components/channels/channel-header';
import { ChannelNotFound } from '@/renderer/components/channels/channel-not-found';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
+import {
+ Container,
+ ContainerBody,
+ ContainerHeader,
+ ContainerSettings,
+} from '@/renderer/components/ui/container';
+import { ContainerBreadcrumb } from '@/renderer/components/layouts/breadcrumbs/container-breadrumb';
+import { useEntryContainer } from '@/renderer/hooks/use-entry-container';
+import { ChannelSettings } from '@/renderer/components/channels/channel-settings';
+import { Conversation } from '@/renderer/components/messages/conversation';
+import { useEntryRadar } from '@/renderer/hooks/use-entry-radar';
interface ChannelContainerProps {
channelId: string;
}
export const ChannelContainer = ({ channelId }: ChannelContainerProps) => {
- const workspace = useWorkspace();
-
- const { data: entry, isPending: isPendingEntry } = useQuery({
- type: 'entry_get',
- entryId: channelId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
-
- const channel = entry as ChannelEntry;
- const channelExists = !!channel;
-
- const { data: root, isPending: isPendingRoot } = useQuery(
- {
- type: 'entry_get',
- entryId: channel?.rootId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: channelExists,
- }
- );
+ const data = useEntryContainer<ChannelEntry>(channelId);
+
+ useEntryRadar(data.entry);
- if (isPendingEntry || (isPendingRoot && channelExists)) {
+ if (data.isPending) {
return null;
}
- if (!channel || !root) {
+ if (!data.entry) {
return <ChannelNotFound />;
}
- const role = extractEntryRole(root, workspace.userId);
- if (!role) {
- return <ChannelNotFound />;
- }
+ const { entry: channel, role } = data;
return (
- <div className="flex h-full w-full flex-col">
- <ChannelHeader channel={channel} role={role} />
- <ChannelBody channel={channel} role={role} />
- </div>
+ <Container>
+ <ContainerHeader>
+ <ContainerBreadcrumb breadcrumb={data.breadcrumb} />
+ <ContainerSettings>
+ <ChannelSettings channel={channel} role={role} />
+ </ContainerSettings>
+ </ContainerHeader>
+ <ContainerBody>
+ <Conversation
+ conversationId={channel.id}
+ rootId={channel.rootId}
+ role={role}
+ />
+ </ContainerBody>
+ </Container>
);
};
diff --git a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
index 6285390d..2e147576 100644
--- a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
@@ -11,6 +11,7 @@ import {
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { useLayout } from '@/renderer/contexts/layout';
interface ChannelCreateDialogProps {
spaceId: string;
@@ -24,6 +25,7 @@ export const ChannelCreateDialog = ({
onOpenChange,
}: ChannelCreateDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -61,7 +63,7 @@ export const ChannelCreateDialog = ({
},
onSuccess(output) {
onOpenChange(false);
- workspace.openInMain(output.id);
+ layout.openLeft(output.id);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
index 7f61ea5e..3c156c6b 100644
--- a/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-delete-dialog.tsx
@@ -8,6 +8,7 @@ import {
AlertDialogTitle,
} from '@/renderer/components/ui/alert-dialog';
import { Button } from '@/renderer/components/ui/button';
+import { useLayout } from '@/renderer/contexts/layout';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
@@ -24,6 +25,7 @@ export const ChannelDeleteDialog = ({
onOpenChange,
}: ChannelDeleteDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -53,7 +55,7 @@ export const ChannelDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
- workspace.closeEntry(channelId);
+ layout.close(channelId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/channels/channel-header.tsx b/apps/desktop/src/renderer/components/channels/channel-header.tsx
deleted file mode 100644
index c44f7b57..00000000
--- a/apps/desktop/src/renderer/components/channels/channel-header.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { ChannelEntry, EntryRole } from '@colanode/core';
-
-import { ChannelSettings } from '@/renderer/components/channels/channel-settings';
-import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';
-import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';
-import { Header } from '@/renderer/components/ui/header';
-import { useContainer } from '@/renderer/contexts/container';
-
-interface ChannelHeaderProps {
- channel: ChannelEntry;
- role: EntryRole;
-}
-
-export const ChannelHeader = ({ channel, role }: ChannelHeaderProps) => {
- const container = useContainer();
-
- return (
- <Header>
- <div className="flex w-full items-center gap-2 px-4">
- <div className="flex-grow">
- {container.mode === 'main' && <EntryBreadcrumb entry={channel} />}
- {container.mode === 'modal' && (
- <EntryFullscreenButton entryId={channel.id} />
- )}
- </div>
- <div className="flex items-center gap-2">
- <ChannelSettings channel={channel} role={role} />
- </div>
- </div>
- </Header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/channels/channel-settings.tsx b/apps/desktop/src/renderer/components/channels/channel-settings.tsx
index 7f502df4..c9fea397 100644
--- a/apps/desktop/src/renderer/components/channels/channel-settings.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-settings.tsx
@@ -30,7 +30,7 @@ export const ChannelSettings = ({ channel, role }: ChannelSettingsProps) => {
<React.Fragment>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Settings className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
+ <Settings className="size-4 cursor-pointer text-muted-foreground hover:text-foreground" />
</DropdownMenuTrigger>
<DropdownMenuContent side="bottom" className="mr-2 w-80">
<DropdownMenuLabel>{channel.attributes.name}</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx
index 2a1c05a8..d04c0f6f 100644
--- a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx
@@ -5,6 +5,7 @@ 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 { useLayout } from '@/renderer/contexts/layout';
import { cn } from '@/shared/lib/utils';
interface ChannelSidebarItemProps {
@@ -13,9 +14,10 @@ interface ChannelSidebarItemProps {
export const ChannelSidebarItem = ({ channel }: ChannelSidebarItemProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const radar = useRadar();
- const isActive = workspace.isEntryActive(channel.id);
+ const isActive = layout.activeTab === channel.id;
const channelState = radar.getChannelState(
workspace.accountId,
workspace.id,
diff --git a/apps/desktop/src/renderer/components/chats/chat-body.tsx b/apps/desktop/src/renderer/components/chats/chat-body.tsx
deleted file mode 100644
index cd6f8c6f..00000000
--- a/apps/desktop/src/renderer/components/chats/chat-body.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ChatEntry, EntryRole } from '@colanode/core';
-import { useEffect } from 'react';
-
-import { Conversation } from '@/renderer/components/messages/conversation';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useRadar } from '@/renderer/contexts/radar';
-
-interface ChatBodyProps {
- chat: ChatEntry;
- role: EntryRole;
-}
-
-export const ChatBody = ({ chat, role }: ChatBodyProps) => {
- const workspace = useWorkspace();
- const radar = useRadar();
-
- useEffect(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, chat.id);
-
- const interval = setInterval(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, chat.id);
- }, 60000);
-
- return () => clearInterval(interval);
- }, [chat.id, chat.type, chat.transactionId]);
-
- return (
- <Conversation conversationId={chat.id} rootId={chat.rootId} role={role} />
- );
-};
diff --git a/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx
index e2506088..672d1e01 100644
--- a/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx
@@ -1,35 +1,48 @@
-import { ChatEntry } from '@colanode/core';
-
import { Avatar } from '@/renderer/components/avatars/avatar';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
interface ChatBreadcrumbItemProps {
- chat: ChatEntry;
+ id: string;
}
-export const ChatBreadcrumbItem = ({ chat }: ChatBreadcrumbItemProps) => {
+export const ChatBreadcrumbItem = ({ id }: ChatBreadcrumbItemProps) => {
const workspace = useWorkspace();
+
+ const { data: chat } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
const userId =
- Object.keys(chat.attributes.collaborators).find(
- (id) => id !== workspace.userId
- ) ?? '';
+ chat && chat.type === 'chat'
+ ? (Object.keys(chat.attributes.collaborators).find(
+ (id) => id !== workspace.userId
+ ) ?? '')
+ : '';
- const { data, isPending } = useQuery({
+ const { data: user } = useQuery({
type: 'user_get',
accountId: workspace.accountId,
workspaceId: workspace.id,
userId,
});
- if (isPending || !data) {
+ if (!chat || !user) {
return null;
}
return (
<div className="flex items-center space-x-2">
- <Avatar size="small" id={data.id} name={data.name} avatar={data.avatar} />
- <span>{data.name}</span>
+ <Avatar
+ id={user.id}
+ name={user.name}
+ avatar={user.avatar}
+ className="size-4"
+ />
+ <span>{user.name}</span>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-container-tab.tsx b/apps/desktop/src/renderer/components/chats/chat-container-tab.tsx
new file mode 100644
index 00000000..71027b91
--- /dev/null
+++ b/apps/desktop/src/renderer/components/chats/chat-container-tab.tsx
@@ -0,0 +1,43 @@
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface ChatContainerTabProps {
+ chatId: string;
+}
+
+export const ChatContainerTab = ({ chatId }: ChatContainerTabProps) => {
+ const workspace = useWorkspace();
+
+ const { data: chat } = useQuery({
+ type: 'entry_get',
+ entryId: chatId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const userId =
+ chat && chat.type === 'chat'
+ ? (Object.keys(chat.attributes.collaborators).find(
+ (id) => id !== workspace.userId
+ ) ?? '')
+ : '';
+
+ const { data: user } = useQuery({
+ type: 'user_get',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ userId,
+ });
+
+ if (!chat || !user) {
+ return <p>Not found</p>;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar size="small" id={user.id} name={user.name} avatar={user.avatar} />
+ <span>{user.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/chats/chat-container.tsx b/apps/desktop/src/renderer/components/chats/chat-container.tsx
index 84276dd0..a3cb5043 100644
--- a/apps/desktop/src/renderer/components/chats/chat-container.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-container.tsx
@@ -1,43 +1,56 @@
-import { extractEntryRole } from '@colanode/core';
-
-import { ChatBody } from '@/renderer/components/chats/chat-body';
-import { ChatHeader } from '@/renderer/components/chats/chat-header';
+import { ChatEntry } from '@colanode/core';
+
+import {
+ Container,
+ ContainerBody,
+ ContainerHeader,
+ ContainerSettings,
+} from '@/renderer/components/ui/container';
+import { ContainerBreadcrumb } from '@/renderer/components/layouts/breadcrumbs/container-breadrumb';
import { ChatNotFound } from '@/renderer/components/chats/chat-not-found';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
+import { EntryCollaboratorsPopover } from '@/renderer/components/collaborators/entry-collaborators-popover';
+import { Conversation } from '@/renderer/components/messages/conversation';
+import { useEntryRadar } from '@/renderer/hooks/use-entry-radar';
+import { useEntryContainer } from '@/renderer/hooks/use-entry-container';
interface ChatContainerProps {
chatId: string;
}
export const ChatContainer = ({ chatId }: ChatContainerProps) => {
- const workspace = useWorkspace();
+ const data = useEntryContainer<ChatEntry>(chatId);
- const { data, isPending } = useQuery({
- type: 'entry_get',
- entryId: chatId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
+ useEntryRadar(data.entry);
- if (isPending) {
+ if (data.isPending) {
return null;
}
- const node = data;
- if (!node || node.type !== 'chat') {
+ if (!data.entry) {
return <ChatNotFound />;
}
- const role = extractEntryRole(node, workspace.userId);
- if (!role) {
- return <ChatNotFound />;
- }
+ const { entry, role } = data;
return (
- <div className="flex h-full w-full flex-col">
- <ChatHeader chat={node} role={role} />
- <ChatBody chat={node} role={role} />
- </div>
+ <Container>
+ <ContainerHeader>
+ <ContainerBreadcrumb breadcrumb={data.breadcrumb} />
+ <ContainerSettings>
+ <EntryCollaboratorsPopover
+ entry={entry}
+ entries={[entry]}
+ role={role}
+ />
+ </ContainerSettings>
+ </ContainerHeader>
+ <ContainerBody>
+ <Conversation
+ conversationId={entry.id}
+ rootId={entry.rootId}
+ role={role}
+ />
+ </ContainerBody>
+ </Container>
);
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx b/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx
index 92f472b8..ef04a3d0 100644
--- a/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-create-popover.tsx
@@ -10,17 +10,19 @@ import { UserSearch } from '@/renderer/components/users/user-search';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { useLayout } from '@/renderer/contexts/layout';
export const ChatCreatePopover = () => {
const workspace = useWorkspace();
const { mutate, isPending } = useMutation();
+ const layout = useLayout();
const [open, setOpen] = React.useState(false);
return (
<Popover open={open} onOpenChange={setOpen} modal={true}>
<PopoverTrigger asChild>
- <SquarePen className="mr-2 size-4 cursor-pointer" />
+ <SquarePen className="size-4 cursor-pointer" />
</PopoverTrigger>
<PopoverContent className="w-96 p-1">
<UserSearch
@@ -35,7 +37,7 @@ export const ChatCreatePopover = () => {
userId: user.id,
},
onSuccess(output) {
- workspace.openInMain(output.id);
+ layout.openLeft(output.id);
setOpen(false);
},
onError(error) {
diff --git a/apps/desktop/src/renderer/components/chats/chat-header.tsx b/apps/desktop/src/renderer/components/chats/chat-header.tsx
deleted file mode 100644
index b3bd90a1..00000000
--- a/apps/desktop/src/renderer/components/chats/chat-header.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ChatEntry, EntryRole } from '@colanode/core';
-
-import { EntryCollaboratorsPopover } from '@/renderer/components/collaborators/entry-collaborators-popover';
-import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';
-import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';
-import { Header } from '@/renderer/components/ui/header';
-import { useContainer } from '@/renderer/contexts/container';
-
-interface ChatHeaderProps {
- chat: ChatEntry;
- role: EntryRole;
-}
-
-export const ChatHeader = ({ chat, role }: ChatHeaderProps) => {
- const container = useContainer();
-
- return (
- <Header>
- <div className="flex w-full items-center gap-2 px-4">
- <div className="flex-grow">
- <EntryBreadcrumb entry={chat} />
- {container.mode === 'modal' && (
- <EntryFullscreenButton entryId={chat.id} />
- )}
- </div>
- <div className="flex items-center gap-2">
- <EntryCollaboratorsPopover
- entry={chat}
- entries={[chat]}
- role={role}
- />
- </div>
- </div>
- </Header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
index 8b1d96f8..80c5c0e2 100644
--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
@@ -6,6 +6,7 @@ import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-ind
import { useRadar } from '@/renderer/contexts/radar';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
+import { useLayout } from '@/renderer/contexts/layout';
import { cn } from '@/shared/lib/utils';
interface ChatSidebarItemProps {
@@ -14,6 +15,7 @@ interface ChatSidebarItemProps {
export const ChatSidebarItem = ({ chat }: ChatSidebarItemProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const radar = useRadar();
const userId =
@@ -37,7 +39,7 @@ export const ChatSidebarItem = ({ chat }: ChatSidebarItemProps) => {
workspace.id,
chat.id
);
- const isActive = workspace.isEntryActive(chat.id);
+ const isActive = layout.activeTab === chat.id;
const unreadCount =
nodeReadState.unseenMessagesCount + nodeReadState.mentionsCount;
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.tsx
index 6eb9cbb5..30991e6a 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
@@ -5,7 +5,7 @@ import { useDrag } from 'react-dnd';
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';
+import { useLayout } from '@/renderer/contexts/layout';
interface DragResult {
option: SelectOptionAttributes;
@@ -13,7 +13,7 @@ interface DragResult {
}
export const BoardViewRecordCard = () => {
- const workspace = useWorkspace();
+ const layout = useLayout();
const view = useView();
const record = useRecord();
@@ -52,7 +52,9 @@ export const BoardViewRecordCard = () => {
role="presentation"
key={record.id}
className="animate-fade-in flex cursor-pointer flex-col gap-1 rounded-md border p-2 text-left hover:bg-gray-50"
- onClick={() => workspace.openInModal(record.id)}
+ onClick={() => {
+ layout.previewLeft(record.id, true);
+ }}
>
<p className={hasName ? '' : 'text-muted-foreground'}>
{hasName ? name : 'Unnamed'}
diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view.tsx
index efb390b5..f453dcee 100644
--- a/apps/desktop/src/renderer/components/databases/boards/board-view.tsx
+++ b/apps/desktop/src/renderer/components/databases/boards/board-view.tsx
@@ -24,7 +24,7 @@ export const BoardView = () => {
const selectOptions = Object.values(groupByField.options ?? {});
return (
<React.Fragment>
- <div className="mt-2 flex flex-row justify-between border-b">
+ <div className="flex flex-row justify-between border-b">
<ViewTabs />
<div className="invisible flex flex-row items-center justify-end group-hover/database:visible">
<BoardViewSettings />
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.tsx
index e5409700..7bb50f07 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,10 +1,10 @@
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';
+import { useLayout } from '@/renderer/contexts/layout';
export const CalendarViewRecordCard = () => {
- const workspace = useWorkspace();
+ const layout = useLayout();
const view = useView();
const record = useRecord();
@@ -16,7 +16,9 @@ export const CalendarViewRecordCard = () => {
role="presentation"
key={record.id}
className="animate-fade-in flex justify-start items-start cursor-pointer flex-col gap-1 rounded-md border p-2 hover:bg-gray-50"
- onClick={() => workspace.openInModal(record.id)}
+ onClick={() => {
+ layout.previewLeft(record.id, true);
+ }}
>
<p className={hasName ? '' : 'text-muted-foreground'}>
{name ?? 'Unnamed'}
diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsx
index 38d1392e..56bd4305 100644
--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsx
+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view.tsx
@@ -23,7 +23,7 @@ export const CalendarView = () => {
return (
<React.Fragment>
- <div className="mt-2 flex flex-row justify-between border-b">
+ <div className="flex flex-row justify-between border-b">
<ViewTabs />
<div className="invisible flex flex-row items-center justify-end group-hover/database:visible">
<CalendarViewSettings />
diff --git a/apps/desktop/src/renderer/components/databases/database-body.tsx b/apps/desktop/src/renderer/components/databases/database-body.tsx
deleted file mode 100644
index dc42abdf..00000000
--- a/apps/desktop/src/renderer/components/databases/database-body.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { DatabaseEntry, EntryRole } from '@colanode/core';
-import { useEffect } from 'react';
-
-import { Database } from '@/renderer/components/databases/database';
-import { DatabaseViews } from '@/renderer/components/databases/database-views';
-import { useRadar } from '@/renderer/contexts/radar';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-
-interface DatabaseBodyProps {
- database: DatabaseEntry;
- role: EntryRole;
-}
-
-export const DatabaseBody = ({ database, role }: DatabaseBodyProps) => {
- const workspace = useWorkspace();
- const radar = useRadar();
-
- useEffect(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, database.id);
-
- const interval = setInterval(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, database.id);
- }, 60000);
-
- return () => clearInterval(interval);
- }, [database.id, database.type, database.transactionId]);
-
- return (
- <Database database={database} role={role}>
- <DatabaseViews />
- </Database>
- );
-};
diff --git a/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx
index ed63295f..687ab9cc 100644
--- a/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx
@@ -1,21 +1,32 @@
import { DatabaseEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface DatabaseBreadcrumbItemProps {
- database: DatabaseEntry;
+ id: string;
}
-export const DatabaseBreadcrumbItem = ({
- database,
-}: DatabaseBreadcrumbItemProps) => {
+export const DatabaseBreadcrumbItem = ({ id }: DatabaseBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+ if (!data) {
+ return null;
+ }
+ const database = data as DatabaseEntry;
return (
<div className="flex items-center space-x-2">
<Avatar
- size="small"
id={database.id}
name={database.attributes.name}
avatar={database.attributes.avatar}
+ className="size-4"
/>
<span>{database.attributes.name}</span>
</div>
diff --git a/apps/desktop/src/renderer/components/databases/database-container-tab.tsx b/apps/desktop/src/renderer/components/databases/database-container-tab.tsx
new file mode 100644
index 00000000..6ffce43f
--- /dev/null
+++ b/apps/desktop/src/renderer/components/databases/database-container-tab.tsx
@@ -0,0 +1,39 @@
+import { DatabaseEntry } from '@colanode/core';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface DatabaseContainerTabProps {
+ databaseId: string;
+}
+
+export const DatabaseContainerTab = ({
+ databaseId,
+}: DatabaseContainerTabProps) => {
+ const workspace = useWorkspace();
+
+ const { data: entry } = useQuery({
+ type: 'entry_get',
+ entryId: databaseId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const database = entry as DatabaseEntry;
+ if (!database) {
+ return <p>Not found</p>;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={database.id}
+ name={database.attributes.name}
+ avatar={database.attributes.avatar}
+ />
+ <span>{database.attributes.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/databases/database-container.tsx b/apps/desktop/src/renderer/components/databases/database-container.tsx
index ee73064f..17ec94f6 100644
--- a/apps/desktop/src/renderer/components/databases/database-container.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-container.tsx
@@ -1,57 +1,51 @@
-import { DatabaseEntry, extractEntryRole } from '@colanode/core';
+import { DatabaseEntry } from '@colanode/core';
-import { DatabaseBody } from '@/renderer/components/databases/database-body';
-import { DatabaseHeader } from '@/renderer/components/databases/database-header';
import { DatabaseNotFound } from '@/renderer/components/databases/database-not-found';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
+import {
+ Container,
+ ContainerBody,
+ ContainerHeader,
+ ContainerSettings,
+} from '@/renderer/components/ui/container';
+import { ContainerBreadcrumb } from '@/renderer/components/layouts/breadcrumbs/container-breadrumb';
+import { useEntryContainer } from '@/renderer/hooks/use-entry-container';
+import { useEntryRadar } from '@/renderer/hooks/use-entry-radar';
+import { DatabaseSettings } from '@/renderer/components/databases/database-settings';
+import { Database } from '@/renderer/components/databases/database';
+import { DatabaseViews } from '@/renderer/components/databases/database-views';
interface DatabaseContainerProps {
databaseId: string;
}
export const DatabaseContainer = ({ databaseId }: DatabaseContainerProps) => {
- const workspace = useWorkspace();
-
- const { data: entry, isPending: isPendingEntry } = useQuery({
- type: 'entry_get',
- entryId: databaseId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
-
- const database = entry as DatabaseEntry;
- const databaseExists = !!database;
-
- const { data: root, isPending: isPendingRoot } = useQuery(
- {
- type: 'entry_get',
- entryId: database?.rootId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: databaseExists,
- }
- );
+ const data = useEntryContainer<DatabaseEntry>(databaseId);
+
+ useEntryRadar(data.entry);
- if (isPendingEntry || (isPendingRoot && databaseExists)) {
+ if (data.isPending) {
return null;
}
- if (!database || !root) {
+ if (!data.entry) {
return <DatabaseNotFound />;
}
- const role = extractEntryRole(root, workspace.userId);
- if (!role) {
- return <DatabaseNotFound />;
- }
+ const { entry: database, role } = data;
return (
- <div className="flex h-full w-full flex-col">
- <DatabaseHeader database={database} role={role} />
- <DatabaseBody database={database} role={role} />
- </div>
+ <Container>
+ <ContainerHeader>
+ <ContainerBreadcrumb breadcrumb={data.breadcrumb} />
+ <ContainerSettings>
+ <DatabaseSettings database={database} role={role} />
+ </ContainerSettings>
+ </ContainerHeader>
+ <ContainerBody>
+ <Database database={database} role={role}>
+ <DatabaseViews />
+ </Database>
+ </ContainerBody>
+ </Container>
);
};
diff --git a/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx
index d85c88db..58eb42cc 100644
--- a/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx
@@ -11,6 +11,7 @@ import {
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { useLayout } from '@/renderer/contexts/layout';
interface DatabaseCreateDialogProps {
spaceId: string;
@@ -24,6 +25,7 @@ export const DatabaseCreateDialog = ({
onOpenChange,
}: DatabaseCreateDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -61,7 +63,7 @@ export const DatabaseCreateDialog = ({
},
onSuccess(output) {
onOpenChange(false);
- workspace.openInMain(output.id);
+ layout.openLeft(output.id);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
index a4312a74..36eba5a3 100644
--- a/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-delete-dialog.tsx
@@ -9,6 +9,7 @@ import {
} from '@/renderer/components/ui/alert-dialog';
import { Button } from '@/renderer/components/ui/button';
import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useLayout } from '@/renderer/contexts/layout';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
@@ -24,6 +25,7 @@ export const DatabaseDeleteDialog = ({
onOpenChange,
}: DatabaseDeleteDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -53,7 +55,7 @@ export const DatabaseDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
- workspace.closeEntry(entryId);
+ layout.close(entryId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/databases/database-header.tsx b/apps/desktop/src/renderer/components/databases/database-header.tsx
deleted file mode 100644
index c1362cce..00000000
--- a/apps/desktop/src/renderer/components/databases/database-header.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { DatabaseEntry, EntryRole } from '@colanode/core';
-
-import { DatabaseSettings } from '@/renderer/components/databases/database-settings';
-import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';
-import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';
-import { Header } from '@/renderer/components/ui/header';
-import { useContainer } from '@/renderer/contexts/container';
-
-interface DatabaseHeaderProps {
- database: DatabaseEntry;
- role: EntryRole;
-}
-
-export const DatabaseHeader = ({ database, role }: DatabaseHeaderProps) => {
- const container = useContainer();
-
- return (
- <Header>
- <div className="flex w-full items-center gap-2 px-4">
- <div className="flex-grow">
- {container.mode === 'main' && <EntryBreadcrumb entry={database} />}
- {container.mode === 'modal' && (
- <EntryFullscreenButton entryId={database.id} />
- )}
- </div>
- <div className="flex items-center gap-2">
- <DatabaseSettings database={database} role={role} />
- </div>
- </div>
- </Header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/databases/database-settings.tsx b/apps/desktop/src/renderer/components/databases/database-settings.tsx
index 1b30a743..ebdcf053 100644
--- a/apps/desktop/src/renderer/components/databases/database-settings.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-settings.tsx
@@ -30,7 +30,7 @@ export const DatabaseSettings = ({ database, role }: DatabaseSettingsProps) => {
<React.Fragment>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Settings className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
+ <Settings className="size-4 cursor-pointer text-muted-foreground hover:text-foreground" />
</DropdownMenuTrigger>
<DropdownMenuContent side="bottom" className="mr-2 w-80">
<DropdownMenuLabel>{database.attributes.name}</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx b/apps/desktop/src/renderer/components/databases/database-sidiebar-item.tsx
index 9db16c5f..9fae5373 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,7 @@
import { DatabaseEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
-import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useLayout } from '@/renderer/contexts/layout';
import { cn } from '@/shared/lib/utils';
interface DatabaseSidebarItemProps {
@@ -9,8 +9,8 @@ interface DatabaseSidebarItemProps {
}
export const DatabaseSidebarItem = ({ database }: DatabaseSidebarItemProps) => {
- const workspace = useWorkspace();
- const isActive = workspace.isEntryActive(database.id);
+ const layout = useLayout();
+ const isActive = layout.activeTab === database.id;
const isUnread = false;
const mentionsCount = 0;
diff --git a/apps/desktop/src/renderer/components/databases/database-views.tsx b/apps/desktop/src/renderer/components/databases/database-views.tsx
index 3ea1ab4a..3e2bb25b 100644
--- a/apps/desktop/src/renderer/components/databases/database-views.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-views.tsx
@@ -25,7 +25,7 @@ export const DatabaseViews = () => {
>
<div className="h-full w-full overflow-y-auto">
<ScrollAreaPrimitive.Root className="relative overflow-hidden">
- <ScrollAreaPrimitive.Viewport className="group/database h-full max-h-[calc(100vh-130px)] w-full overflow-y-auto rounded-[inherit] px-10 pb-12">
+ <ScrollAreaPrimitive.Viewport className="group/database h-full max-h-[calc(100vh-130px)] w-full overflow-y-auto rounded-[inherit]">
{activeView && <View view={activeView} />}
</ScrollAreaPrimitive.Viewport>
<ScrollBar orientation="horizontal" />
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.tsx
index ec7d4553..dff9214c 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
@@ -6,6 +6,7 @@ import React, { Fragment } from 'react';
import { Spinner } from '@/renderer/components/ui/spinner';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
+import { useLayout } from '@/renderer/contexts/layout';
import { toast } from '@/renderer/hooks/use-toast';
interface NameEditorProps {
@@ -58,6 +59,7 @@ interface TableViewNameCellProps {
export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const [isEditing, setIsEditing] = React.useState(false);
const { mutate, isPending } = useMutation();
@@ -111,7 +113,9 @@ export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
<button
type="button"
className="absolute right-2 flex h-6 cursor-pointer flex-row items-center gap-1 rounded-md border bg-white p-1 text-sm text-muted-foreground opacity-0 hover:bg-gray-50 group-hover:opacity-100"
- onClick={() => workspace.openInModal(record.id)}
+ onClick={() => {
+ layout.previewLeft(record.id, true);
+ }}
>
<Maximize2 className="mr-1 size-4" /> <p>Open</p>
</button>
diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view.tsx
index 330eb9b9..a88c7ae2 100644
--- a/apps/desktop/src/renderer/components/databases/tables/table-view.tsx
+++ b/apps/desktop/src/renderer/components/databases/tables/table-view.tsx
@@ -12,7 +12,7 @@ import { ViewTabs } from '@/renderer/components/databases/view-tabs';
export const TableView = () => {
return (
<React.Fragment>
- <div className="mt-2 flex flex-row justify-between border-b">
+ <div className="flex flex-row justify-between border-b">
<ViewTabs />
<div className="invisible flex flex-row items-center justify-end group-hover/database:visible">
<TableViewSettings />
diff --git a/apps/desktop/src/renderer/components/databases/view.tsx b/apps/desktop/src/renderer/components/databases/view.tsx
index 16e936b8..e9be47e9 100644
--- a/apps/desktop/src/renderer/components/databases/view.tsx
+++ b/apps/desktop/src/renderer/components/databases/view.tsx
@@ -16,6 +16,7 @@ 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 { useLayout } from '@/renderer/contexts/layout';
import {
generateFieldValuesFromFilters,
generateViewFieldIndex,
@@ -34,6 +35,7 @@ interface ViewProps {
export const View = ({ view }: ViewProps) => {
const workspace = useWorkspace();
const database = useDatabase();
+ const layout = useLayout();
const { mutate } = useMutation();
const fields: ViewField[] = React.useMemo(() => {
@@ -537,7 +539,7 @@ export const View = ({ view }: ViewProps) => {
fields,
},
onSuccess: (output) => {
- workspace.openInModal(output.id);
+ layout.previewLeft(output.id, true);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/files/file-block.tsx b/apps/desktop/src/renderer/components/files/file-block.tsx
index a73f1853..4d65b9dc 100644
--- a/apps/desktop/src/renderer/components/files/file-block.tsx
+++ b/apps/desktop/src/renderer/components/files/file-block.tsx
@@ -1,5 +1,6 @@
import { FilePreview } from '@/renderer/components/files/file-preview';
import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useLayout } from '@/renderer/contexts/layout';
import { useQuery } from '@/renderer/hooks/use-query';
interface FileBlockProps {
@@ -8,6 +9,7 @@ interface FileBlockProps {
export const FileBlock = ({ id }: FileBlockProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { data } = useQuery({
type: 'file_get',
@@ -24,7 +26,7 @@ export const FileBlock = ({ id }: FileBlockProps) => {
<div
className="flex h-72 max-h-72 max-w-128 w-full cursor-pointer overflow-hidden rounded-md p-2 hover:bg-gray-100"
onClick={() => {
- workspace.openInModal(id);
+ layout.previewLeft(id, true);
}}
>
<FilePreview file={data} />
diff --git a/apps/desktop/src/renderer/components/files/file-body.tsx b/apps/desktop/src/renderer/components/files/file-body.tsx
index fbb27322..57dd82c8 100644
--- a/apps/desktop/src/renderer/components/files/file-body.tsx
+++ b/apps/desktop/src/renderer/components/files/file-body.tsx
@@ -1,11 +1,9 @@
import { SquareArrowOutUpRight } from 'lucide-react';
-// import { useEffect } from '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';
-// import { useRadar } from '@/renderer/contexts/radar';
import { FileWithState } from '@/shared/types/files';
interface FileBodyProps {
@@ -14,27 +12,6 @@ interface FileBodyProps {
export const FileBody = ({ file }: FileBodyProps) => {
const workspace = useWorkspace();
- // const radar = useRadar();
-
- // useEffect(() => {
- // radar.markAsOpened(
- // workspace.userId,
- // file.id,
- // 'file',
- // file.transactionId
- // );
-
- // const interval = setInterval(() => {
- // radar.markAsOpened(
- // workspace.userId,
- // file.id,
- // file.type,
- // file.transactionId
- // );
- // }, 60000);
-
- // return () => clearInterval(interval);
- // }, [file.id, file.type, file.transactionId]);
return (
<div className="flex h-full max-h-full w-full flex-row items-center gap-2">
diff --git a/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsx
new file mode 100644
index 00000000..0225c90c
--- /dev/null
+++ b/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsx
@@ -0,0 +1,32 @@
+import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+
+interface FileBreadcrumbItemProps {
+ id: string;
+}
+
+export const FileBreadcrumbItem = ({ id }: FileBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+
+ const { data: file } = useQuery({
+ type: 'file_get',
+ id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ if (!file) {
+ return null;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <FileThumbnail
+ file={file}
+ className="size-4 overflow-hidden rounded object-contain"
+ />
+ <span>{file.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/files/file-container-tab.tsx b/apps/desktop/src/renderer/components/files/file-container-tab.tsx
new file mode 100644
index 00000000..d676ec87
--- /dev/null
+++ b/apps/desktop/src/renderer/components/files/file-container-tab.tsx
@@ -0,0 +1,32 @@
+import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface FileContainerTabProps {
+ fileId: string;
+}
+
+export const FileContainerTab = ({ fileId }: FileContainerTabProps) => {
+ const workspace = useWorkspace();
+
+ const { data: file } = useQuery({
+ type: 'file_get',
+ id: fileId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ if (!file) {
+ return <p>Not found</p>;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <FileThumbnail
+ file={file}
+ className="size-4 overflow-hidden rounded object-contain"
+ />
+ <span>{file.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/files/file-container.tsx b/apps/desktop/src/renderer/components/files/file-container.tsx
index aeb9fd62..633da567 100644
--- a/apps/desktop/src/renderer/components/files/file-container.tsx
+++ b/apps/desktop/src/renderer/components/files/file-container.tsx
@@ -1,72 +1,41 @@
-import { extractEntryRole } from '@colanode/core';
-
import { FileBody } from '@/renderer/components/files/file-body';
-import { FileHeader } from '@/renderer/components/files/file-header';
+import {
+ Container,
+ ContainerBody,
+ ContainerHeader,
+ ContainerSettings,
+} from '@/renderer/components/ui/container';
+import { ContainerBreadcrumb } from '@/renderer/components/layouts/breadcrumbs/container-breadrumb';
import { FileNotFound } from '@/renderer/components/files/file-not-found';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
+import { useFileContainer } from '@/renderer/hooks/use-file-container';
+import { FileSettings } from '@/renderer/components/files/file-settings';
interface FileContainerProps {
fileId: string;
}
export const FileContainer = ({ fileId }: FileContainerProps) => {
- const workspace = useWorkspace();
-
- const { data: file, isPending: isPendingFile } = useQuery({
- type: 'file_get',
- id: fileId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
-
- const fileExists = !!file;
-
- const { data: entry, isPending: isPendingEntry } = useQuery(
- {
- type: 'entry_get',
- entryId: file?.entryId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: fileExists,
- }
- );
+ const data = useFileContainer(fileId);
- const { data: root, isPending: isPendingRoot } = useQuery(
- {
- type: 'entry_get',
- entryId: file?.rootId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: fileExists,
- }
- );
-
- if (
- isPendingFile ||
- (isPendingEntry && fileExists) ||
- (isPendingRoot && fileExists)
- ) {
+ if (data.isPending) {
return null;
}
- if (!file || !entry || !root) {
- return <FileNotFound />;
- }
-
- const role = extractEntryRole(root, workspace.userId);
- if (!role) {
+ if (!data.file) {
return <FileNotFound />;
}
return (
- <div className="flex h-full w-full flex-col">
- <FileHeader file={file} role={role} entry={entry} />
- <FileBody file={file} />
- </div>
+ <Container>
+ <ContainerHeader>
+ <ContainerBreadcrumb breadcrumb={data.breadcrumb} />
+ <ContainerSettings>
+ <FileSettings file={data.file} role={data.role} />
+ </ContainerSettings>
+ </ContainerHeader>
+ <ContainerBody>
+ <FileBody file={data.file} />
+ </ContainerBody>
+ </Container>
);
};
diff --git a/apps/desktop/src/renderer/components/files/file-context-menu.tsx b/apps/desktop/src/renderer/components/files/file-context-menu.tsx
index f1943f20..af9be467 100644
--- a/apps/desktop/src/renderer/components/files/file-context-menu.tsx
+++ b/apps/desktop/src/renderer/components/files/file-context-menu.tsx
@@ -9,7 +9,7 @@ import {
ContextMenuShortcut,
ContextMenuTrigger,
} from '@/renderer/components/ui/context-menu';
-import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useLayout } from '@/renderer/contexts/layout';
interface FileContextMenuProps {
id: string;
@@ -17,7 +17,7 @@ interface FileContextMenuProps {
}
export const FileContextMenu = ({ id, children }: FileContextMenuProps) => {
- const workspace = useWorkspace();
+ const layout = useLayout();
const [openDelete, setOpenDelete] = React.useState(false);
return (
@@ -27,7 +27,7 @@ export const FileContextMenu = ({ id, children }: FileContextMenuProps) => {
<ContextMenuContent className="w-64">
<ContextMenuItem
onSelect={() => {
- workspace.openInModal(id);
+ layout.previewLeft(id, true);
}}
className="pl-2"
>
diff --git a/apps/desktop/src/renderer/components/files/file-header.tsx b/apps/desktop/src/renderer/components/files/file-header.tsx
deleted file mode 100644
index d54af8f8..00000000
--- a/apps/desktop/src/renderer/components/files/file-header.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Entry, EntryRole } from '@colanode/core';
-
-import { FileSettings } from '@/renderer/components/files/file-settings';
-import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';
-import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';
-import { Header } from '@/renderer/components/ui/header';
-import { useContainer } from '@/renderer/contexts/container';
-import { FileWithState } from '@/shared/types/files';
-
-interface FileHeaderProps {
- file: FileWithState;
- entry: Entry;
- role: EntryRole;
-}
-
-export const FileHeader = ({ file, entry, role }: FileHeaderProps) => {
- const container = useContainer();
-
- return (
- <Header>
- <div className="flex w-full items-center gap-2 px-4">
- <div className="flex-grow">
- {container.mode === 'main' && <EntryBreadcrumb entry={entry} />}
- {container.mode === 'modal' && (
- <EntryFullscreenButton entryId={file.id} />
- )}
- </div>
- <div className="flex items-center gap-2">
- <FileSettings file={file} role={role} entry={entry} />
- </div>
- </div>
- </Header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/files/file-settings.tsx b/apps/desktop/src/renderer/components/files/file-settings.tsx
index 3f2ce08b..e7e57fa4 100644
--- a/apps/desktop/src/renderer/components/files/file-settings.tsx
+++ b/apps/desktop/src/renderer/components/files/file-settings.tsx
@@ -1,6 +1,6 @@
import { Copy, Settings, Trash2 } from 'lucide-react';
import React from 'react';
-import { Entry, EntryRole, hasEntryRole } from '@colanode/core';
+import { EntryRole, hasEntryRole } from '@colanode/core';
import { FileDeleteDialog } from '@/renderer/components/files/file-delete-dialog';
import {
@@ -15,14 +15,13 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
interface FileSettingsProps {
file: FileWithState;
role: EntryRole;
- entry: Entry;
}
-export const FileSettings = ({ file, role, entry }: FileSettingsProps) => {
+export const FileSettings = ({ file, role }: FileSettingsProps) => {
const workspace = useWorkspace();
const [showDeleteModal, setShowDeleteModal] = React.useState(false);
const canDelete =
- file.parentId === entry.id &&
+ file.parentId === file.entryId &&
(file.createdBy === workspace.userId || hasEntryRole(role, 'editor'));
return (
diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsx
index 8557b79c..98826624 100644
--- a/apps/desktop/src/renderer/components/folders/folder-body.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx
@@ -7,7 +7,7 @@ import {
List,
Upload,
} from 'lucide-react';
-import React, { useEffect } from 'react';
+import React from 'react';
import { FolderFiles } from '@/renderer/components/folders/folder-files';
import { Button } from '@/renderer/components/ui/button';
@@ -25,16 +25,15 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { FolderLayoutType } from '@/shared/types/folders';
import { toast } from '@/renderer/hooks/use-toast';
-import { useRadar } from '@/renderer/contexts/radar';
-export type FolderLayout = {
+export type FolderLayoutOption = {
value: FolderLayoutType;
name: string;
description: string;
icon: React.FC<React.SVGProps<SVGSVGElement>>;
};
-export const folderLayouts: FolderLayout[] = [
+export const folderLayouts: FolderLayoutOption[] = [
{
name: 'Grid',
value: 'grid',
@@ -62,7 +61,6 @@ interface FolderBodyProps {
export const FolderBody = ({ folder }: FolderBodyProps) => {
const workspace = useWorkspace();
- const radar = useRadar();
const { mutate } = useMutation();
const [layout, setLayout] = React.useState<FolderLayoutType>('grid');
@@ -120,16 +118,6 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {
isDialogOpenedRef.current = false;
};
- useEffect(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, folder.id);
-
- const interval = setInterval(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, folder.id);
- }, 60000);
-
- return () => clearInterval(interval);
- }, [folder.id, folder.type, folder.transactionId]);
-
return (
<Dropzone
text="Drop files here to upload them in the folder"
@@ -137,7 +125,7 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {
files.forEach((file) => console.log(file));
}}
>
- <div className="flex h-full max-h-full flex-col gap-4 overflow-y-auto px-10 pt-4">
+ <div className="flex h-full max-h-full flex-col gap-4 overflow-y-auto">
<div className="flex flex-row justify-between">
<div className="flex flex-row gap-2">
<Button type="button" variant="outline" onClick={openFileDialog}>
@@ -181,8 +169,8 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {
{/* <FolderUploads
uploads={Object.values(uploads)}
open={openUploads}
- setOpen={setOpenUploads}
- /> */}
+ setOpen={setOpenUploads}
+ /> */}
</Dropzone>
);
};
diff --git a/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx
index 0280c4a7..e640cbe0 100644
--- a/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx
@@ -1,19 +1,33 @@
import { FolderEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface FolderBreadcrumbItemProps {
- folder: FolderEntry;
+ id: string;
}
-export const FolderBreadcrumbItem = ({ folder }: FolderBreadcrumbItemProps) => {
+export const FolderBreadcrumbItem = ({ id }: FolderBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+ if (!data) {
+ return null;
+ }
+ const folder = data as FolderEntry;
+
return (
<div className="flex items-center space-x-2">
<Avatar
- size="small"
id={folder.id}
name={folder.attributes.name}
avatar={folder.attributes.avatar}
+ className="size-4"
/>
<span>{folder.attributes.name}</span>
</div>
diff --git a/apps/desktop/src/renderer/components/folders/folder-container-tab.tsx b/apps/desktop/src/renderer/components/folders/folder-container-tab.tsx
new file mode 100644
index 00000000..e3ae8dd6
--- /dev/null
+++ b/apps/desktop/src/renderer/components/folders/folder-container-tab.tsx
@@ -0,0 +1,37 @@
+import { FolderEntry } from '@colanode/core';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface FolderContainerTabProps {
+ folderId: string;
+}
+
+export const FolderContainerTab = ({ folderId }: FolderContainerTabProps) => {
+ const workspace = useWorkspace();
+
+ const { data: entry } = useQuery({
+ type: 'entry_get',
+ entryId: folderId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const folder = entry as FolderEntry;
+ if (!folder) {
+ return <p>Not found</p>;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={folder.id}
+ name={folder.attributes.name}
+ avatar={folder.attributes.avatar}
+ />
+ <span>{folder.attributes.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/folders/folder-container.tsx b/apps/desktop/src/renderer/components/folders/folder-container.tsx
index 40f1b547..8332f897 100644
--- a/apps/desktop/src/renderer/components/folders/folder-container.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-container.tsx
@@ -1,57 +1,48 @@
-import { extractEntryRole, FolderEntry } from '@colanode/core';
+import { FolderEntry } from '@colanode/core';
-import { FolderBody } from '@/renderer/components/folders/folder-body';
-import { FolderHeader } from '@/renderer/components/folders/folder-header';
import { FolderNotFound } from '@/renderer/components/folders/folder-not-found';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
+import {
+ Container,
+ ContainerBody,
+ ContainerHeader,
+ ContainerSettings,
+} from '@/renderer/components/ui/container';
+import { ContainerBreadcrumb } from '@/renderer/components/layouts/breadcrumbs/container-breadrumb';
+import { useEntryContainer } from '@/renderer/hooks/use-entry-container';
+import { useEntryRadar } from '@/renderer/hooks/use-entry-radar';
+import { FolderSettings } from '@/renderer/components/folders/folder-settings';
+import { FolderBody } from '@/renderer/components/folders/folder-body';
interface FolderContainerProps {
folderId: string;
}
export const FolderContainer = ({ folderId }: FolderContainerProps) => {
- const workspace = useWorkspace();
-
- const { data: entry, isPending: isPendingEntry } = useQuery({
- type: 'entry_get',
- entryId: folderId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
-
- const folder = entry as FolderEntry;
- const folderExists = !!folder;
-
- const { data: root, isPending: isPendingRoot } = useQuery(
- {
- type: 'entry_get',
- entryId: folder?.rootId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: folderExists,
- }
- );
+ const data = useEntryContainer<FolderEntry>(folderId);
- if (isPendingEntry || (isPendingRoot && folderExists)) {
+ useEntryRadar(data.entry);
+
+ if (data.isPending) {
return null;
}
- if (!folder || !root) {
+ if (!data.entry) {
return <FolderNotFound />;
}
- const role = extractEntryRole(root, workspace.userId);
- if (!role) {
- return <FolderNotFound />;
- }
+ const { entry: folder, role } = data;
return (
- <div className="flex h-full w-full flex-col">
- <FolderHeader folder={folder} role={role} />
- <FolderBody folder={folder} role={role} />
- </div>
+ <Container>
+ <ContainerHeader>
+ <ContainerBreadcrumb breadcrumb={data.breadcrumb} />
+ <ContainerSettings>
+ <FolderSettings folder={folder} role={role} />
+ </ContainerSettings>
+ </ContainerHeader>
+ <ContainerBody>
+ <FolderBody folder={folder} role={role} />
+ </ContainerBody>
+ </Container>
);
};
diff --git a/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx
index ecee4df9..1ac3f5dc 100644
--- a/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx
@@ -11,6 +11,7 @@ import {
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { useLayout } from '@/renderer/contexts/layout';
interface FolderCreateDialogProps {
spaceId: string;
@@ -24,6 +25,7 @@ export const FolderCreateDialog = ({
onOpenChange,
}: FolderCreateDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -62,7 +64,7 @@ export const FolderCreateDialog = ({
},
onSuccess(output) {
onOpenChange(false);
- workspace.openInMain(output.id);
+ layout.previewLeft(output.id);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
index fd5db097..97b08fcd 100644
--- a/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-delete-dialog.tsx
@@ -10,6 +10,7 @@ import {
import { Button } from '@/renderer/components/ui/button';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
+import { useLayout } from '@/renderer/contexts/layout';
import { toast } from '@/renderer/hooks/use-toast';
interface FolderDeleteDialogProps {
@@ -24,6 +25,7 @@ export const FolderDeleteDialog = ({
onOpenChange,
}: FolderDeleteDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -53,7 +55,7 @@ export const FolderDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
- workspace.closeEntry(entryId);
+ layout.close(entryId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/folders/folder-files.tsx b/apps/desktop/src/renderer/components/folders/folder-files.tsx
index 947b8b24..183fad7d 100644
--- a/apps/desktop/src/renderer/components/folders/folder-files.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-files.tsx
@@ -1,4 +1,3 @@
-import { getIdType, IdType } from '@colanode/core';
import React from 'react';
import { match } from 'ts-pattern';
@@ -10,6 +9,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQueries } from '@/renderer/hooks/use-queries';
import { FileListQueryInput } from '@/shared/queries/files/file-list';
import { FolderLayoutType } from '@/shared/types/folders';
+import { useLayout } from '@/renderer/contexts/layout';
const FILES_PER_PAGE = 100;
@@ -19,8 +19,14 @@ interface FolderFilesProps {
layout: FolderLayoutType;
}
-export const FolderFiles = ({ id, name, layout }: FolderFilesProps) => {
+export const FolderFiles = ({
+ id,
+ name,
+ layout: folderLayout,
+}: FolderFilesProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
+
const [lastPage] = React.useState<number>(1);
const inputs: FileListQueryInput[] = Array.from({
length: lastPage,
@@ -46,18 +52,12 @@ export const FolderFiles = ({ id, name, layout }: FolderFilesProps) => {
console.log('onClick');
},
onDoubleClick: (_, id) => {
- const idType = getIdType(id);
-
- if (idType === IdType.Folder) {
- workspace.openInMain(id);
- } else if (idType === IdType.File) {
- workspace.openInModal(id);
- }
+ layout.previewLeft(id, true);
},
onMove: () => {},
}}
>
- {match(layout)
+ {match(folderLayout)
.with('grid', () => <GridLayout />)
.with('list', () => <ListLayout />)
.with('gallery', () => <GalleryLayout />)
diff --git a/apps/desktop/src/renderer/components/folders/folder-header.tsx b/apps/desktop/src/renderer/components/folders/folder-header.tsx
deleted file mode 100644
index cd91eef6..00000000
--- a/apps/desktop/src/renderer/components/folders/folder-header.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { FolderEntry, EntryRole } from '@colanode/core';
-
-import { FolderSettings } from '@/renderer/components/folders/folder-settings';
-import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';
-import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';
-import { Header } from '@/renderer/components/ui/header';
-import { useContainer } from '@/renderer/contexts/container';
-
-interface FolderHeaderProps {
- folder: FolderEntry;
- role: EntryRole;
-}
-
-export const FolderHeader = ({ folder, role }: FolderHeaderProps) => {
- const container = useContainer();
-
- return (
- <Header>
- <div className="flex w-full items-center gap-2 px-4">
- <div className="flex-grow">
- <EntryBreadcrumb entry={folder} />
- {container.mode === 'modal' && (
- <EntryFullscreenButton entryId={folder.id} />
- )}
- </div>
- <div className="flex items-center gap-2">
- <FolderSettings folder={folder} role={role} />
- </div>
- </div>
- </Header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/folders/folder-settings.tsx b/apps/desktop/src/renderer/components/folders/folder-settings.tsx
index ebf06781..e3640d02 100644
--- a/apps/desktop/src/renderer/components/folders/folder-settings.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-settings.tsx
@@ -30,7 +30,7 @@ export const FolderSettings = ({ folder, role }: FolderSettingsProps) => {
<React.Fragment>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Settings className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
+ <Settings className="size-4 cursor-pointer text-muted-foreground hover:text-foreground" />
</DropdownMenuTrigger>
<DropdownMenuContent side="bottom" className="mr-2 w-80">
<DropdownMenuLabel>{folder.attributes.name}</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx b/apps/desktop/src/renderer/components/folders/folder-sidebar-item.tsx
index a8fd4403..88741cea 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,7 @@
import { FolderEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
-import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useLayout } from '@/renderer/contexts/layout';
import { cn } from '@/shared/lib/utils';
interface FolderSidebarItemProps {
@@ -9,8 +9,8 @@ interface FolderSidebarItemProps {
}
export const FolderSidebarItem = ({ folder }: FolderSidebarItemProps) => {
- const workspace = useWorkspace();
- const isActive = workspace.isEntryActive(folder.id);
+ const layout = useLayout();
+ const isActive = layout.activeTab === folder.id;
const isUnread = false;
const mentionsCount = 0;
diff --git a/apps/desktop/src/renderer/components/layouts/breadcrumbs/container-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/layouts/breadcrumbs/container-breadcrumb-item.tsx
new file mode 100644
index 00000000..86cffb66
--- /dev/null
+++ b/apps/desktop/src/renderer/components/layouts/breadcrumbs/container-breadcrumb-item.tsx
@@ -0,0 +1,44 @@
+import { getIdType, IdType } from '@colanode/core';
+
+import { ChannelBreadcrumbItem } from '@/renderer/components/channels/channel-breadcrumb-item';
+import { ChatBreadcrumbItem } from '@/renderer/components/chats/chat-breadcrumb-item';
+import { DatabaseBreadcrumbItem } from '@/renderer/components/databases/database-breadcrumb-item';
+import { FolderBreadcrumbItem } from '@/renderer/components/folders/folder-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';
+import { FileBreadcrumbItem } from '@/renderer/components/files/file-breadcrumb-item';
+import { MessageBreadcrumbItem } from '@/renderer/components/messages/message-breadcrumb-item';
+
+interface ContainerBreadcrumbItemProps {
+ id: string;
+}
+
+export const ContainerBreadcrumbItem = ({
+ id,
+}: ContainerBreadcrumbItemProps) => {
+ const idType = getIdType(id);
+
+ switch (idType) {
+ case IdType.Space:
+ return <SpaceBreadcrumbItem id={id} />;
+ case IdType.Channel:
+ return <ChannelBreadcrumbItem id={id} />;
+ case IdType.Chat:
+ return <ChatBreadcrumbItem id={id} />;
+ case IdType.Page:
+ return <PageBreadcrumbItem id={id} />;
+ case IdType.Database:
+ return <DatabaseBreadcrumbItem id={id} />;
+ case IdType.Record:
+ return <RecordBreadcrumbItem id={id} />;
+ case IdType.Folder:
+ return <FolderBreadcrumbItem id={id} />;
+ case IdType.File:
+ return <FileBreadcrumbItem id={id} />;
+ case IdType.Message:
+ return <MessageBreadcrumbItem id={id} />;
+ default:
+ return null;
+ }
+};
diff --git a/apps/desktop/src/renderer/components/layouts/breadcrumbs/container-breadrumb.tsx b/apps/desktop/src/renderer/components/layouts/breadcrumbs/container-breadrumb.tsx
new file mode 100644
index 00000000..c5569d46
--- /dev/null
+++ b/apps/desktop/src/renderer/components/layouts/breadcrumbs/container-breadrumb.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+
+import {
+ Breadcrumb,
+ BreadcrumbEllipsis,
+ BreadcrumbItem,
+ BreadcrumbList,
+ BreadcrumbSeparator,
+} from '@/renderer/components/ui/breadcrumb';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/renderer/components/ui/dropdown-menu';
+import { useLayout } from '@/renderer/contexts/layout';
+import { ContainerBreadcrumbItem } from '@/renderer/components/layouts/breadcrumbs/container-breadcrumb-item';
+
+interface ContainerBreadcrumbProps {
+ breadcrumb: string[];
+}
+
+export const ContainerBreadcrumb = ({
+ breadcrumb,
+}: ContainerBreadcrumbProps) => {
+ const layout = useLayout();
+
+ // Show ellipsis if we have more than 3 nodes (first + last two)
+ const showEllipsis = breadcrumb.length > 3;
+
+ // Get visible entries: first entry + last two entries
+ const visibleItems = showEllipsis
+ ? [breadcrumb[0], ...breadcrumb.slice(-2)]
+ : breadcrumb;
+
+ // Get middle entries for ellipsis (everything except first and last two)
+ const ellipsisItems = showEllipsis ? breadcrumb.slice(1, -2) : [];
+
+ return (
+ <Breadcrumb className="flex-grow">
+ <BreadcrumbList>
+ {visibleItems.map((item, index) => {
+ if (!item) {
+ return null;
+ }
+
+ const isFirst = index === 0;
+
+ return (
+ <React.Fragment key={item}>
+ {!isFirst && <BreadcrumbSeparator />}
+ <BreadcrumbItem
+ className="hover:cursor-pointer hover:text-foreground"
+ onClick={() => {
+ layout.openLeft(item);
+ }}
+ >
+ <ContainerBreadcrumbItem id={item} />
+ </BreadcrumbItem>
+ {showEllipsis && isFirst && (
+ <React.Fragment>
+ <BreadcrumbSeparator />
+ <BreadcrumbItem>
+ <DropdownMenu>
+ <DropdownMenuTrigger className="flex items-center gap-1">
+ <BreadcrumbEllipsis className="h-4 w-4" />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="start">
+ {ellipsisItems.map((ellipsisItem) => {
+ return (
+ <DropdownMenuItem
+ key={ellipsisItem}
+ onClick={() => {
+ layout.openLeft(ellipsisItem);
+ }}
+ >
+ <BreadcrumbItem className="hover:cursor-pointer hover:text-foreground">
+ <ContainerBreadcrumbItem id={ellipsisItem} />
+ </BreadcrumbItem>
+ </DropdownMenuItem>
+ );
+ })}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </BreadcrumbItem>
+ </React.Fragment>
+ )}
+ </React.Fragment>
+ );
+ })}
+ </BreadcrumbList>
+ </Breadcrumb>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/layouts/entry-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/layouts/entry-breadcrumb-item.tsx
deleted file mode 100644
index b2e4bc00..00000000
--- a/apps/desktop/src/renderer/components/layouts/entry-breadcrumb-item.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Entry } from '@colanode/core';
-
-import { ChannelBreadcrumbItem } from '@/renderer/components/channels/channel-breadcrumb-item';
-import { ChatBreadcrumbItem } from '@/renderer/components/chats/chat-breadcrumb-item';
-import { DatabaseBreadcrumbItem } from '@/renderer/components/databases/database-breadcrumb-item';
-import { FolderBreadcrumbItem } from '@/renderer/components/folders/folder-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 EntryBreadcrumbItemProps {
- entry: Entry;
-}
-
-export const EntryBreadcrumbItem = ({ entry }: EntryBreadcrumbItemProps) => {
- switch (entry.type) {
- case 'space':
- return <SpaceBreadcrumbItem space={entry} />;
- case 'channel':
- return <ChannelBreadcrumbItem channel={entry} />;
- case 'chat':
- return <ChatBreadcrumbItem chat={entry} />;
- case 'page':
- return <PageBreadcrumbItem page={entry} />;
- case 'database':
- return <DatabaseBreadcrumbItem database={entry} />;
- case 'record':
- return <RecordBreadcrumbItem record={entry} />;
- case 'folder':
- return <FolderBreadcrumbItem folder={entry} />;
- default:
- return null;
- }
-};
diff --git a/apps/desktop/src/renderer/components/layouts/entry-breadcrumb.tsx b/apps/desktop/src/renderer/components/layouts/entry-breadcrumb.tsx
deleted file mode 100644
index 449d63db..00000000
--- a/apps/desktop/src/renderer/components/layouts/entry-breadcrumb.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { Entry, EntryType } from '@colanode/core';
-import React from 'react';
-
-import { EntryBreadcrumbItem } from '@/renderer/components/layouts/entry-breadcrumb-item';
-import {
- Breadcrumb,
- BreadcrumbEllipsis,
- BreadcrumbItem,
- BreadcrumbList,
- BreadcrumbSeparator,
-} from '@/renderer/components/ui/breadcrumb';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@/renderer/components/ui/dropdown-menu';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
-
-interface EntryBreadcrumbProps {
- entry: Entry;
-}
-
-const isClickable = (type: EntryType) => type !== 'space';
-
-export const EntryBreadcrumb = ({ entry }: EntryBreadcrumbProps) => {
- const workspace = useWorkspace();
- const { data } = useQuery(
- {
- type: 'entry_tree_get',
- entryId: entry.id,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: entry.type !== 'chat',
- }
- );
-
- const entries = data?.length ? data : [entry];
-
- // Show ellipsis if we have more than 3 nodes (first + last two)
- const showEllipsis = entries.length > 3;
-
- // Get visible entries: first entry + last two entries
- const visibleEntries = showEllipsis
- ? [entries[0], ...entries.slice(-2)]
- : entries;
-
- // Get middle entries for ellipsis (everything except first and last two)
- const ellipsisEntries = showEllipsis ? entries.slice(1, -2) : [];
-
- return (
- <Breadcrumb>
- <BreadcrumbList>
- {visibleEntries.map((entry, index) => {
- if (!entry) {
- return null;
- }
-
- const isFirst = index === 0;
- const isClickableEntry = isClickable(entry.type);
-
- return (
- <React.Fragment key={entry.id}>
- {!isFirst && <BreadcrumbSeparator />}
- <BreadcrumbItem
- className={
- isClickableEntry
- ? 'hover:cursor-pointer hover:text-foreground'
- : ''
- }
- onClick={() => {
- if (isClickableEntry) {
- workspace.openInMain(entry.id);
- }
- }}
- >
- <EntryBreadcrumbItem entry={entry} />
- </BreadcrumbItem>
- {showEllipsis && isFirst && (
- <React.Fragment>
- <BreadcrumbSeparator />
- <BreadcrumbItem>
- <DropdownMenu>
- <DropdownMenuTrigger className="flex items-center gap-1">
- <BreadcrumbEllipsis className="h-4 w-4" />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="start">
- {ellipsisEntries.map((ellipsisEntry) => {
- const isClickableEllipsisEntry = isClickable(
- ellipsisEntry.type
- );
- return (
- <DropdownMenuItem
- key={ellipsisEntry.id}
- disabled={!isClickableEllipsisEntry}
- onClick={() => {
- if (isClickableEllipsisEntry) {
- workspace.openInMain(ellipsisEntry.id);
- }
- }}
- >
- <BreadcrumbItem
- className={
- isClickableEllipsisEntry
- ? 'hover:cursor-pointer hover:text-foreground'
- : ''
- }
- >
- <EntryBreadcrumbItem entry={ellipsisEntry} />
- </BreadcrumbItem>
- </DropdownMenuItem>
- );
- })}
- </DropdownMenuContent>
- </DropdownMenu>
- </BreadcrumbItem>
- </React.Fragment>
- )}
- </React.Fragment>
- );
- })}
- </BreadcrumbList>
- </Breadcrumb>
- );
-};
diff --git a/apps/desktop/src/renderer/components/layouts/entry-container.tsx b/apps/desktop/src/renderer/components/layouts/entry-container.tsx
deleted file mode 100644
index fdc3611c..00000000
--- a/apps/desktop/src/renderer/components/layouts/entry-container.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { getIdType, IdType } from '@colanode/core';
-
-import { ChannelContainer } from '@/renderer/components/channels/channel-container';
-import { ChatContainer } from '@/renderer/components/chats/chat-container';
-import { DatabaseContainer } from '@/renderer/components/databases/database-container';
-import { FileContainer } from '@/renderer/components/files/file-container';
-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 EntryContainerProps {
- entryId: string;
-}
-
-export const EntryContainer = ({ entryId }: EntryContainerProps) => {
- const idType = getIdType(entryId);
-
- switch (idType) {
- case IdType.Channel:
- return <ChannelContainer channelId={entryId} />;
- case IdType.Page:
- return <PageContainer pageId={entryId} />;
- case IdType.Database:
- return <DatabaseContainer databaseId={entryId} />;
- case IdType.Record:
- return <RecordContainer recordId={entryId} />;
- case IdType.Chat:
- return <ChatContainer chatId={entryId} />;
- case IdType.Folder:
- return <FolderContainer folderId={entryId} />;
- case IdType.File:
- return <FileContainer fileId={entryId} />;
- default:
- return null;
- }
-};
diff --git a/apps/desktop/src/renderer/components/layouts/entry-fullscreen-button.tsx b/apps/desktop/src/renderer/components/layouts/entry-fullscreen-button.tsx
deleted file mode 100644
index 783453b2..00000000
--- a/apps/desktop/src/renderer/components/layouts/entry-fullscreen-button.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Fullscreen } from 'lucide-react';
-
-import { useWorkspace } from '@/renderer/contexts/workspace';
-
-interface EntryFullscreenButtonProps {
- entryId: string;
-}
-
-export const EntryFullscreenButton = ({
- entryId,
-}: EntryFullscreenButtonProps) => {
- const workspace = useWorkspace();
-
- return (
- <Fullscreen
- className="size-5 cursor-pointer text-muted-foreground hover:text-foreground"
- onClick={() => {
- workspace.openInMain(entryId);
- }}
- />
- );
-};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-main.tsx b/apps/desktop/src/renderer/components/layouts/layout-main.tsx
deleted file mode 100644
index 7dc5cb1c..00000000
--- a/apps/desktop/src/renderer/components/layouts/layout-main.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { EntryContainer } from '@/renderer/components/layouts/entry-container';
-import { ContainerContext } from '@/renderer/contexts/container';
-
-interface LayoutMainProps {
- entryId: string;
-}
-
-export const LayoutMain = ({ entryId }: LayoutMainProps) => {
- return (
- <ContainerContext.Provider value={{ entryId, mode: 'main' }}>
- <EntryContainer entryId={entryId} />
- </ContainerContext.Provider>
- );
-};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-modal.tsx b/apps/desktop/src/renderer/components/layouts/layout-modal.tsx
deleted file mode 100644
index a56c357d..00000000
--- a/apps/desktop/src/renderer/components/layouts/layout-modal.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { VisuallyHidden } from '@radix-ui/react-visually-hidden';
-import React from 'react';
-
-import { EntryContainer } from '@/renderer/components/layouts/entry-container';
-import {
- Dialog,
- DialogContent,
- DialogTitle,
-} from '@/renderer/components/ui/dialog';
-import { ContainerContext } from '@/renderer/contexts/container';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-
-interface LayoutModalProps {
- entryId: string;
-}
-
-export const LayoutModal = ({ entryId }: LayoutModalProps) => {
- const workspace = useWorkspace();
- const [open, setOpen] = React.useState(true);
-
- React.useEffect(() => {
- if (!open) {
- workspace.closeModal();
- }
- }, [open]);
-
- return (
- <Dialog
- open={open}
- onOpenChange={(open) => {
- setOpen(open);
- }}
- >
- <DialogContent
- className="flex h-[calc(100vh-100px)] max-h-full w-8/12 max-w-full flex-col gap-1 overflow-hidden px-0.5 pt-0 md:w-8/12"
- aria-describedby={undefined}
- >
- <VisuallyHidden>
- <DialogTitle>Modal</DialogTitle>
- </VisuallyHidden>
- <ContainerContext.Provider value={{ entryId, mode: 'modal' }}>
- <EntryContainer entryId={entryId} />
- </ContainerContext.Provider>
- </DialogContent>
- </Dialog>
- );
-};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-right.tsx b/apps/desktop/src/renderer/components/layouts/layout-right.tsx
deleted file mode 100644
index 81f5d712..00000000
--- a/apps/desktop/src/renderer/components/layouts/layout-right.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { EntryContainer } from '@/renderer/components/layouts/entry-container';
-import { ContainerContext } from '@/renderer/contexts/container';
-
-interface LayoutRightProps {
- entryId: string;
-}
-
-export const LayoutRight = ({ entryId }: LayoutRightProps) => {
- return (
- <ContainerContext.Provider value={{ entryId, mode: 'panel' }}>
- <EntryContainer entryId={entryId} />
- </ContainerContext.Provider>
- );
-};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-tabs.tsx b/apps/desktop/src/renderer/components/layouts/layout-tabs.tsx
new file mode 100644
index 00000000..7fb8fe50
--- /dev/null
+++ b/apps/desktop/src/renderer/components/layouts/layout-tabs.tsx
@@ -0,0 +1,123 @@
+import { X } from 'lucide-react';
+import { match } from 'ts-pattern';
+import { getIdType, IdType } from '@colanode/core';
+
+import { ScrollArea, ScrollBar } from '@/renderer/components/ui/scroll-area';
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from '@/renderer/components/ui/tabs';
+import { cn } from '@/shared/lib/utils';
+import { ChannelContainer } from '@/renderer/components/channels/channel-container';
+import { ChatContainer } from '@/renderer/components/chats/chat-container';
+import { DatabaseContainer } from '@/renderer/components/databases/database-container';
+import { FileContainer } from '@/renderer/components/files/file-container';
+import { FolderContainer } from '@/renderer/components/folders/folder-container';
+import { PageContainer } from '@/renderer/components/pages/page-container';
+import { RecordContainer } from '@/renderer/components/records/record-container';
+import { ChannelContainerTab } from '@/renderer/components/channels/channel-container-tab';
+import { DatabaseContainerTab } from '@/renderer/components/databases/database-container-tab';
+import { FileContainerTab } from '@/renderer/components/files/file-container-tab';
+import { FolderContainerTab } from '@/renderer/components/folders/folder-container-tab';
+import { PageContainerTab } from '@/renderer/components/pages/page-container-tab';
+import { RecordContainerTab } from '@/renderer/components/records/record-container-tab';
+import { ChatContainerTab } from '@/renderer/components/chats/chat-container-tab';
+import { ContainerTab } from '@/shared/types/workspaces';
+
+interface LayoutTabsProps {
+ tabs: ContainerTab[];
+ onTabChange: (value: string) => void;
+ onFocus: () => void;
+ onClose: (value: string) => void;
+}
+
+export const LayoutTabs = ({
+ tabs,
+ onTabChange,
+ onFocus,
+ onClose,
+}: LayoutTabsProps) => {
+ const activeTab = tabs.find((t) => t.active)?.id;
+
+ return (
+ <Tabs
+ defaultValue={tabs[0]?.id}
+ value={activeTab}
+ onValueChange={onTabChange}
+ onFocus={onFocus}
+ className="h-full min-h-full w-full min-w-full flex flex-col"
+ >
+ <ScrollArea>
+ <TabsList className="h-10 bg-slate-50 w-full justify-start p-0 app-drag-region">
+ {tabs.map((tab) => (
+ <TabsTrigger
+ value={tab.id}
+ key={tab.id}
+ className={cn(
+ 'overflow-hidden rounded-b-none bg-muted py-2 data-[state=active]:z-10 data-[state=active]:shadow-none h-10 group/tab app-no-drag-region',
+ tab.preview && 'italic'
+ )}
+ onAuxClick={(e) => {
+ if (e.button === 1) {
+ e.preventDefault();
+ onClose(tab.id);
+ }
+ }}
+ >
+ {match(getIdType(tab.id))
+ .with(IdType.Channel, () => (
+ <ChannelContainerTab channelId={tab.id} />
+ ))
+ .with(IdType.Page, () => <PageContainerTab pageId={tab.id} />)
+ .with(IdType.Database, () => (
+ <DatabaseContainerTab databaseId={tab.id} />
+ ))
+ .with(IdType.Record, () => (
+ <RecordContainerTab recordId={tab.id} />
+ ))
+ .with(IdType.Chat, () => <ChatContainerTab chatId={tab.id} />)
+ .with(IdType.Folder, () => (
+ <FolderContainerTab folderId={tab.id} />
+ ))
+ .with(IdType.File, () => <FileContainerTab fileId={tab.id} />)
+ .otherwise(() => null)}
+
+ <div
+ className="opacity-0 group-hover/tab:opacity-100 group-data-[state=active]/tab:opacity-100 transition-opacity duration-200"
+ onClick={() => onClose(tab.id)}
+ >
+ <X className="size-4 text-muted-foreground ml-2 hover:text-primary" />
+ </div>
+ </TabsTrigger>
+ ))}
+ </TabsList>
+ <ScrollBar orientation="horizontal" />
+ </ScrollArea>
+ <div className="flex-grow overflow-hidden">
+ {tabs.map((tab) => (
+ <TabsContent
+ value={tab.id}
+ key={tab.id}
+ className="h-full min-h-full w-full min-w-full m-0 pt-2"
+ >
+ {match(getIdType(tab.id))
+ .with(IdType.Channel, () => (
+ <ChannelContainer channelId={tab.id} />
+ ))
+ .with(IdType.Page, () => <PageContainer pageId={tab.id} />)
+ .with(IdType.Database, () => (
+ <DatabaseContainer databaseId={tab.id} />
+ ))
+ .with(IdType.Record, () => <RecordContainer recordId={tab.id} />)
+ .with(IdType.Chat, () => <ChatContainer chatId={tab.id} />)
+ .with(IdType.Folder, () => <FolderContainer folderId={tab.id} />)
+ .with(IdType.File, () => <FileContainer fileId={tab.id} />)
+ .otherwise(() => null)}
+ </TabsContent>
+ ))}
+ </div>
+ </Tabs>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/layouts/layout.tsx b/apps/desktop/src/renderer/components/layouts/layout.tsx
index cf621b9c..4b82fdef 100644
--- a/apps/desktop/src/renderer/components/layouts/layout.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout.tsx
@@ -1,20 +1,149 @@
-import { LayoutMain } from '@/renderer/components/layouts/layout-main';
-import { LayoutModal } from '@/renderer/components/layouts/layout-modal';
+import { Resizable } from 're-resizable';
+
+import { LayoutTabs } from '@/renderer/components/layouts/layout-tabs';
import { Sidebar } from '@/renderer/components/layouts/sidebars/sidebar';
+import { LayoutContext } from '@/renderer/contexts/layout';
+import { useLayoutState } from '@/renderer/hooks/user-layout-state';
+import { useWindowSize } from '@/renderer/hooks/use-window-size';
+import { percentToNumber } from '@/shared/lib/utils';
+
+export const Layout = () => {
+ const windowSize = useWindowSize();
+
+ const {
+ activeContainer,
+ sidebarMetadata,
+ leftContainerMetadata,
+ rightContainerMetadata,
+ handleSidebarResize,
+ handleMenuChange,
+ handleRightContainerResize,
+ handleFocus,
+ handleOpen,
+ handleOpenLeft,
+ handleOpenRight,
+ handleClose,
+ handleCloseLeft,
+ handleCloseRight,
+ handlePreview,
+ handlePreviewLeft,
+ handlePreviewRight,
+ handleActivateLeft,
+ handleActivateRight,
+ } = useLayoutState();
-interface LayoutProps {
- main?: string | null;
- modal?: string | null;
-}
+ const shouldDisplayLeft = leftContainerMetadata.tabs.length > 0;
+
+ const shouldDisplayRight =
+ shouldDisplayLeft && rightContainerMetadata.tabs.length > 0;
-export const Layout = ({ main, modal }: LayoutProps) => {
return (
- <div className="w-screen min-w-screen h-screen min-h-screen flex flex-row">
- <Sidebar />
- <main className="h-full max-h-screen w-full min-w-128 flex-grow overflow-hidden bg-white">
- {main && <LayoutMain entryId={main} />}
- </main>
- {modal && <LayoutModal entryId={modal} />}
- </div>
+ <LayoutContext.Provider
+ value={{
+ open: handleOpen,
+ openLeft: handleOpenLeft,
+ openRight: handleOpenRight,
+ close: handleClose,
+ closeLeft: handleCloseLeft,
+ closeRight: handleCloseRight,
+ preview: handlePreview,
+ previewLeft: handlePreviewLeft,
+ previewRight: handlePreviewRight,
+ activeTab:
+ activeContainer === 'left'
+ ? leftContainerMetadata.tabs.find((t) => t.active)?.id
+ : rightContainerMetadata.tabs.find((t) => t.active)?.id,
+ }}
+ >
+ <div className="w-screen min-w-screen h-screen min-h-screen flex flex-row">
+ <Resizable
+ as="aside"
+ size={{ width: sidebarMetadata.width, height: '100vh' }}
+ className="border-r border-gray-200"
+ minWidth={200}
+ maxWidth={500}
+ enable={{
+ bottom: false,
+ bottomLeft: false,
+ bottomRight: false,
+ left: false,
+ right: true,
+ top: false,
+ topLeft: false,
+ topRight: false,
+ }}
+ handleClasses={{
+ right: 'opacity-0 hover:opacity-100 bg-blue-300 z-30',
+ }}
+ handleStyles={{
+ right: {
+ width: '3px',
+ right: '-3px',
+ },
+ }}
+ onResize={(_, __, ref) => {
+ handleSidebarResize(ref.offsetWidth);
+ }}
+ >
+ <Sidebar
+ menu={sidebarMetadata.menu}
+ onMenuChange={handleMenuChange}
+ />
+ </Resizable>
+
+ {shouldDisplayLeft && (
+ <div className="h-full max-h-screen w-full flex-grow overflow-hidden bg-white">
+ <LayoutTabs
+ tabs={leftContainerMetadata.tabs}
+ onFocus={() => {
+ handleFocus('left');
+ }}
+ onClose={handleCloseLeft}
+ onTabChange={handleActivateLeft}
+ />
+ </div>
+ )}
+ {shouldDisplayRight && (
+ <Resizable
+ as="div"
+ className="h-full max-h-full min-h-full overflow-hidden border-l border-gray-200 bg-white"
+ size={{ width: rightContainerMetadata.width, height: '100%' }}
+ minWidth={percentToNumber(windowSize.width, 20)}
+ maxWidth={percentToNumber(windowSize.width, 50)}
+ enable={{
+ bottom: false,
+ bottomLeft: false,
+ bottomRight: false,
+ left: true,
+ right: false,
+ top: false,
+ topLeft: false,
+ topRight: false,
+ }}
+ handleClasses={{
+ left: 'opacity-0 hover:opacity-100 bg-blue-300 z-30',
+ }}
+ handleStyles={{
+ left: {
+ width: '3px',
+ left: '-3px',
+ },
+ }}
+ onResize={(_, __, ref) => {
+ handleRightContainerResize(ref.offsetWidth);
+ }}
+ >
+ <LayoutTabs
+ tabs={rightContainerMetadata.tabs}
+ onFocus={() => {
+ handleFocus('right');
+ }}
+ onTabChange={handleActivateRight}
+ onClose={handleCloseRight}
+ />
+ </Resizable>
+ )}
+ </div>
+ </LayoutContext.Provider>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-chats.tsx b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-chats.tsx
index da69b49d..b7de0f26 100644
--- a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-chats.tsx
+++ b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-chats.tsx
@@ -1,12 +1,13 @@
import { useQuery } from '@/renderer/hooks/use-query';
-import { Header } from '@/renderer/components/ui/header';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { ChatSidebarItem } from '@/renderer/components/chats/chat-sidebar-item';
import { ChatCreatePopover } from '@/renderer/components/chats/chat-create-popover';
import { cn } from '@/shared/lib/utils';
+import { useLayout } from '@/renderer/contexts/layout';
export const SidebarChats = () => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { data } = useQuery({
type: 'chat_list',
@@ -19,24 +20,27 @@ export const SidebarChats = () => {
const chats = data ?? [];
return (
- <div className="flex flex-col group/sidebar-spaces h-full px-2">
- <Header>
- <p className="font-medium text-muted-foreground flex-grow">Chats</p>
- <div className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100 flex items-center justify-center p-0">
+ <div className="flex flex-col group/sidebar-chats h-full px-2">
+ <div className="flex items-center justify-between h-12 pl-2 pr-1">
+ <p className="font-bold text-muted-foreground flex-grow">Chats</p>
+ <div className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-chats:opacity-100 flex items-center justify-center">
<ChatCreatePopover />
</div>
- </Header>
+ </div>
<div className="flex w-full min-w-0 flex-col gap-1">
{chats.map((item) => (
<button
key={item.id}
className={cn(
'px-2 flex w-full items-center gap-2 overflow-hidden rounded-md text-left text-sm hover:bg-sidebar-accent hover:text-sidebar-accent-foreground h-7',
- workspace.isEntryActive(item.id) &&
+ layout.activeTab === item.id &&
'bg-sidebar-accent text-sidebar-accent-foreground font-medium'
)}
onClick={() => {
- workspace.openInMain(item.id);
+ layout.preview(item.id);
+ }}
+ onDoubleClick={() => {
+ layout.open(item.id);
}}
>
<ChatSidebarItem chat={item} />
diff --git a/apps/desktop/src/renderer/components/layouts/entry-sidebar-item.tsx b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-item.tsx
similarity index 89%
rename from apps/desktop/src/renderer/components/layouts/entry-sidebar-item.tsx
rename to apps/desktop/src/renderer/components/layouts/sidebars/sidebar-item.tsx
index b4d81d4f..effbc4dc 100644
--- a/apps/desktop/src/renderer/components/layouts/entry-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-item.tsx
@@ -8,13 +8,11 @@ import { FolderSidebarItem } from '@/renderer/components/folders/folder-sidebar-
import { PageSidebarItem } from '@/renderer/components/pages/page-sidebar-item';
import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';
-interface EntrySidebarItemProps {
+interface SidebarItemProps {
entry: Entry;
}
-export const EntrySidebarItem = ({
- entry,
-}: EntrySidebarItemProps): React.ReactNode => {
+export const SidebarItem = ({ entry }: SidebarItemProps): React.ReactNode => {
switch (entry.type) {
case 'space':
return <SpaceSidebarItem space={entry} />;
diff --git a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu.tsx b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu.tsx
index 2728aa3e..0195cba0 100644
--- a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu.tsx
+++ b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-menu.tsx
@@ -3,10 +3,11 @@ import { LayoutGrid, MessageCircle } from 'lucide-react';
import { SidebarMenuIcon } from '@/renderer/components/layouts/sidebars/sidebar-menu-icon';
import { SidebarMenuHeader } from '@/renderer/components/layouts/sidebars/sidebar-menu-header';
import { SidebarMenuFooter } from '@/renderer/components/layouts/sidebars/sidebar-menu-footer';
+import { SidebarMenuType } from '@/shared/types/workspaces';
interface SidebarMenuProps {
- value: string;
- onChange: (value: string) => void;
+ value: SidebarMenuType;
+ onChange: (value: SidebarMenuType) => void;
}
export const SidebarMenu = ({ value, onChange }: SidebarMenuProps) => {
diff --git a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-spaces.tsx b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-spaces.tsx
index fa16f9b1..a70b82ca 100644
--- a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-spaces.tsx
+++ b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar-spaces.tsx
@@ -1,5 +1,4 @@
import { useQuery } from '@/renderer/hooks/use-query';
-import { Header } from '@/renderer/components/ui/header';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { SpaceCreateButton } from '@/renderer/components/spaces/space-create-button';
import { SpaceSidebarItem } from '@/renderer/components/spaces/space-sidebar-item';
@@ -22,14 +21,14 @@ export const SidebarSpaces = () => {
return (
<div className="flex flex-col group/sidebar-spaces h-full px-2">
- <Header>
- <p className="font-medium text-muted-foreground flex-grow">Spaces</p>
+ <div className="flex items-center justify-between h-12 pl-2 pr-1">
+ <p className="font-bold text-muted-foreground flex-grow">Spaces</p>
{canCreateSpace && (
- <div className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100 flex items-center justify-center p-0">
+ <div className="text-muted-foreground opacity-0 transition-opacity group-hover/sidebar-spaces:opacity-100 flex items-center justify-center">
<SpaceCreateButton />
</div>
)}
- </Header>
+ </div>
<div className="flex w-full min-w-0 flex-col gap-1">
{spaces.map((space) => (
<SpaceSidebarItem space={space} key={space.id} />
diff --git a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar.tsx b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar.tsx
index 6462f78d..9b123512 100644
--- a/apps/desktop/src/renderer/components/layouts/sidebars/sidebar.tsx
+++ b/apps/desktop/src/renderer/components/layouts/sidebars/sidebar.tsx
@@ -1,15 +1,17 @@
-import React from 'react';
-
import { SidebarMenu } from '@/renderer/components/layouts/sidebars/sidebar-menu';
import { SidebarChats } from '@/renderer/components/layouts/sidebars/sidebar-chats';
import { SidebarSpaces } from '@/renderer/components/layouts/sidebars/sidebar-spaces';
+import { SidebarMenuType } from '@/shared/types/workspaces';
-export const Sidebar = () => {
- const [menu, setMenu] = React.useState('spaces');
+interface SidebarProps {
+ menu: SidebarMenuType;
+ onMenuChange: (menu: SidebarMenuType) => void;
+}
+export const Sidebar = ({ menu, onMenuChange }: SidebarProps) => {
return (
- <div className="flex h-screen min-h-screen max-h-screen w-80 min-w-80 flex-row bg-slate-50">
- <SidebarMenu value={menu} onChange={setMenu} />
+ <div className="flex h-screen min-h-screen max-h-screen w-full min-w-full flex-row bg-slate-50">
+ <SidebarMenu value={menu} onChange={onMenuChange} />
<div className="min-h-0 flex-grow overflow-auto">
{menu === 'spaces' && <SidebarSpaces />}
{menu === 'chats' && <SidebarChats />}
diff --git a/apps/desktop/src/renderer/components/messages/conversation.tsx b/apps/desktop/src/renderer/components/messages/conversation.tsx
index d543eefe..4b3fcbb7 100644
--- a/apps/desktop/src/renderer/components/messages/conversation.tsx
+++ b/apps/desktop/src/renderer/components/messages/conversation.tsx
@@ -97,25 +97,27 @@ export const Conversation = ({
},
}}
>
- <ScrollArea
- ref={viewportRef}
- onScroll={handleScroll}
- className="flex-grow overflow-y-auto px-10"
- >
- <div className="container" ref={containerRef}>
- <MessageList />
- </div>
- <InView
- className="h-4"
- rootMargin="20px"
- onChange={(inView) => {
- bottomVisibleRef.current = inView;
- }}
+ <div className="h-full min-h-full w-full min-w-full flex flex-col">
+ <ScrollArea
+ ref={viewportRef}
+ onScroll={handleScroll}
+ className="flex-grow overflow-y-auto"
>
- <div ref={bottomRef} className="h-4"></div>
- </InView>
- </ScrollArea>
- <MessageCreate ref={messageCreateRef} />
+ <div ref={containerRef}>
+ <MessageList />
+ </div>
+ <InView
+ className="h-4"
+ rootMargin="20px"
+ onChange={(inView) => {
+ bottomVisibleRef.current = inView;
+ }}
+ >
+ <div ref={bottomRef} className="h-4"></div>
+ </InView>
+ </ScrollArea>
+ <MessageCreate ref={messageCreateRef} />
+ </div>
</ConversationContext.Provider>
);
};
diff --git a/apps/desktop/src/renderer/components/messages/message-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/messages/message-breadcrumb-item.tsx
new file mode 100644
index 00000000..c8137449
--- /dev/null
+++ b/apps/desktop/src/renderer/components/messages/message-breadcrumb-item.tsx
@@ -0,0 +1,14 @@
+import { MessageCircle } from 'lucide-react';
+
+interface MessageBreadcrumbItemProps {
+ id: string;
+}
+
+export const MessageBreadcrumbItem = ({ id }: MessageBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2" id={id}>
+ <MessageCircle className="size-4" />
+ <span>Message</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/messages/message-create.tsx b/apps/desktop/src/renderer/components/messages/message-create.tsx
index b514b0cb..ba3d8c70 100644
--- a/apps/desktop/src/renderer/components/messages/message-create.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-create.tsx
@@ -139,7 +139,7 @@ export const MessageCreate = React.forwardRef<MessageCreateRefProps>(
}, [messageEditorRef]);
return (
- <div className="container mt-1 px-10">
+ <div className="mt-1">
<div className="flex flex-col">
{conversation.canCreateMessage && replyTo && (
<MessageReplyBanner
diff --git a/apps/desktop/src/renderer/components/pages/page-body.tsx b/apps/desktop/src/renderer/components/pages/page-body.tsx
index 96cbbec2..b03aa3c2 100644
--- a/apps/desktop/src/renderer/components/pages/page-body.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-body.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from 'react';
+import { useCallback } from 'react';
import { EntryRole, PageEntry, hasEntryRole } from '@colanode/core';
import { JSONContent } from '@tiptap/core';
@@ -6,7 +6,6 @@ import { Document } from '@/renderer/components/documents/document';
import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { toast } from '@/renderer/hooks/use-toast';
-import { useRadar } from '@/renderer/contexts/radar';
interface PageBodyProps {
page: PageEntry;
@@ -15,7 +14,6 @@ interface PageBodyProps {
export const PageBody = ({ page, role }: PageBodyProps) => {
const workspace = useWorkspace();
- const radar = useRadar();
const canEdit = hasEntryRole(role, 'editor');
const handleUpdate = useCallback(
@@ -40,18 +38,8 @@ export const PageBody = ({ page, role }: PageBodyProps) => {
[workspace.accountId, workspace.id, page.id]
);
- useEffect(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, page.id);
-
- const interval = setInterval(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, page.id);
- }, 60000);
-
- return () => clearInterval(interval);
- }, [page.id, page.type, page.transactionId]);
-
return (
- <ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
+ <ScrollArea className="h-full max-h-full w-full overflow-y-auto">
<Document
entryId={page.id}
rootId={page.rootId}
diff --git a/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx
index fc2d4268..adacfe66 100644
--- a/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx
@@ -1,19 +1,35 @@
import { PageEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface PageBreadcrumbItemProps {
- page: PageEntry;
+ id: string;
}
-export const PageBreadcrumbItem = ({ page }: PageBreadcrumbItemProps) => {
+export const PageBreadcrumbItem = ({ id }: PageBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ if (!data) {
+ return null;
+ }
+
+ const page = data as PageEntry;
+
return (
<div className="flex items-center space-x-2">
<Avatar
- size="small"
id={page.id}
name={page.attributes.name}
avatar={page.attributes.avatar}
+ className="size-4"
/>
<span>{page.attributes.name}</span>
</div>
diff --git a/apps/desktop/src/renderer/components/pages/page-container-tab.tsx b/apps/desktop/src/renderer/components/pages/page-container-tab.tsx
new file mode 100644
index 00000000..5dcd7472
--- /dev/null
+++ b/apps/desktop/src/renderer/components/pages/page-container-tab.tsx
@@ -0,0 +1,37 @@
+import { PageEntry } from '@colanode/core';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface PageContainerTabProps {
+ pageId: string;
+}
+
+export const PageContainerTab = ({ pageId }: PageContainerTabProps) => {
+ const workspace = useWorkspace();
+
+ const { data: entry } = useQuery({
+ type: 'entry_get',
+ entryId: pageId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const page = entry as PageEntry;
+ if (!page) {
+ return <p>Not found</p>;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={page.id}
+ name={page.attributes.name}
+ avatar={page.attributes.avatar}
+ />
+ <span>{page.attributes.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/pages/page-container.tsx b/apps/desktop/src/renderer/components/pages/page-container.tsx
index cabe1b99..8729a13c 100644
--- a/apps/desktop/src/renderer/components/pages/page-container.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-container.tsx
@@ -1,57 +1,48 @@
-import { extractEntryRole, PageEntry } from '@colanode/core';
+import { PageEntry } from '@colanode/core';
-import { PageBody } from '@/renderer/components/pages/page-body';
-import { PageHeader } from '@/renderer/components/pages/page-header';
import { PageNotFound } from '@/renderer/components/pages/page-not-found';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
+import { useEntryContainer } from '@/renderer/hooks/use-entry-container';
+import { useEntryRadar } from '@/renderer/hooks/use-entry-radar';
+import { PageSettings } from '@/renderer/components/pages/page-settings';
+import {
+ Container,
+ ContainerBody,
+ ContainerHeader,
+ ContainerSettings,
+} from '@/renderer/components/ui/container';
+import { ContainerBreadcrumb } from '@/renderer/components/layouts/breadcrumbs/container-breadrumb';
+import { PageBody } from '@/renderer/components/pages/page-body';
interface PageContainerProps {
pageId: string;
}
export const PageContainer = ({ pageId }: PageContainerProps) => {
- const workspace = useWorkspace();
-
- const { data: entry, isPending: isPendingEntry } = useQuery({
- type: 'entry_get',
- entryId: pageId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
-
- const page = entry as PageEntry;
- const pageExists = !!page;
-
- const { data: root, isPending: isPendingRoot } = useQuery(
- {
- type: 'entry_get',
- entryId: page?.rootId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: pageExists,
- }
- );
+ const data = useEntryContainer<PageEntry>(pageId);
- if (isPendingEntry || (isPendingRoot && pageExists)) {
+ useEntryRadar(data.entry);
+
+ if (data.isPending) {
return null;
}
- if (!page || !root) {
+ if (!data.entry) {
return <PageNotFound />;
}
- const role = extractEntryRole(root, workspace.userId);
- if (!role) {
- return <PageNotFound />;
- }
+ const { entry: page, role } = data;
return (
- <div className="flex h-full w-full flex-col">
- <PageHeader page={page} role={role} />
- <PageBody page={page} role={role} />
- </div>
+ <Container>
+ <ContainerHeader>
+ <ContainerBreadcrumb breadcrumb={data.breadcrumb} />
+ <ContainerSettings>
+ <PageSettings page={page} role={role} />
+ </ContainerSettings>
+ </ContainerHeader>
+ <ContainerBody>
+ <PageBody page={page} role={role} />
+ </ContainerBody>
+ </Container>
);
};
diff --git a/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx
index b6de5dfa..88da2a8a 100644
--- a/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx
@@ -11,6 +11,7 @@ import {
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { toast } from '@/renderer/hooks/use-toast';
+import { useLayout } from '@/renderer/contexts/layout';
interface PageCreateDialogProps {
spaceId: string;
@@ -24,6 +25,7 @@ export const PageCreateDialog = ({
onOpenChange,
}: PageCreateDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -62,7 +64,7 @@ export const PageCreateDialog = ({
},
onSuccess(output) {
onOpenChange(false);
- workspace.openInMain(output.id);
+ layout.openLeft(output.id);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
index 3906fd11..0d15aa50 100644
--- a/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-delete-dialog.tsx
@@ -10,6 +10,7 @@ import {
import { Button } from '@/renderer/components/ui/button';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
+import { useLayout } from '@/renderer/contexts/layout';
import { toast } from '@/renderer/hooks/use-toast';
interface PageDeleteDialogProps {
@@ -24,6 +25,7 @@ export const PageDeleteDialog = ({
onOpenChange,
}: PageDeleteDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -53,7 +55,7 @@ export const PageDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
- workspace.closeEntry(pageId);
+ layout.close(pageId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/pages/page-header.tsx b/apps/desktop/src/renderer/components/pages/page-header.tsx
deleted file mode 100644
index decdb517..00000000
--- a/apps/desktop/src/renderer/components/pages/page-header.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { EntryRole, PageEntry } from '@colanode/core';
-
-import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';
-import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';
-import { PageSettings } from '@/renderer/components/pages/page-settings';
-import { Header } from '@/renderer/components/ui/header';
-import { useContainer } from '@/renderer/contexts/container';
-
-interface PageHeaderProps {
- page: PageEntry;
- role: EntryRole;
-}
-
-export const PageHeader = ({ page, role }: PageHeaderProps) => {
- const container = useContainer();
-
- return (
- <Header>
- <div className="flex w-full items-center gap-2 px-4">
- <div className="flex-grow">
- <EntryBreadcrumb entry={page} />
- {container.mode === 'modal' && (
- <EntryFullscreenButton entryId={page.id} />
- )}
- </div>
- <div className="flex items-center gap-2">
- <PageSettings page={page} role={role} />
- </div>
- </div>
- </Header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/pages/page-settings.tsx b/apps/desktop/src/renderer/components/pages/page-settings.tsx
index 1f6810fc..73b23507 100644
--- a/apps/desktop/src/renderer/components/pages/page-settings.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-settings.tsx
@@ -30,7 +30,7 @@ export const PageSettings = ({ page, role }: PageSettingsProps) => {
<React.Fragment>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Settings className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
+ <Settings className="size-4 cursor-pointer text-muted-foreground hover:text-foreground" />
</DropdownMenuTrigger>
<DropdownMenuContent side="bottom" className="mr-2 w-80">
<DropdownMenuLabel>{page.attributes.name}</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx b/apps/desktop/src/renderer/components/pages/page-sidebar-item.tsx
index 21a85cfe..affbf484 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,7 @@
import { PageEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
-import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useLayout } from '@/renderer/contexts/layout';
import { cn } from '@/shared/lib/utils';
interface PageSidebarItemProps {
@@ -9,8 +9,8 @@ interface PageSidebarItemProps {
}
export const PageSidebarItem = ({ page }: PageSidebarItemProps) => {
- const workspace = useWorkspace();
- const isActive = workspace.isEntryActive(page.id);
+ const layout = useLayout();
+ const isActive = layout.activeTab === page.id;
const isUnread = false;
const mentionsCount = 0;
diff --git a/apps/desktop/src/renderer/components/records/record-body.tsx b/apps/desktop/src/renderer/components/records/record-body.tsx
index 10e6c695..8e1fa0cd 100644
--- a/apps/desktop/src/renderer/components/records/record-body.tsx
+++ b/apps/desktop/src/renderer/components/records/record-body.tsx
@@ -1,13 +1,7 @@
-import {
- DatabaseEntry,
- EntryRole,
- hasEntryRole,
- RecordEntry,
-} from '@colanode/core';
+import { EntryRole, hasEntryRole, RecordEntry } from '@colanode/core';
import { JSONContent } from '@tiptap/core';
-import { useCallback, useEffect } from 'react';
+import { useCallback } from 'react';
-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';
@@ -15,17 +9,15 @@ import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { Separator } from '@/renderer/components/ui/separator';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { toast } from '@/renderer/hooks/use-toast';
-import { useRadar } from '@/renderer/contexts/radar';
+import { RecordDatabase } from '@/renderer/components/records/record-database';
interface RecordBodyProps {
record: RecordEntry;
- database: DatabaseEntry;
role: EntryRole;
}
-export const RecordBody = ({ record, database, role }: RecordBodyProps) => {
+export const RecordBody = ({ record, role }: RecordBodyProps) => {
const workspace = useWorkspace();
- const radar = useRadar();
const canEdit =
record.createdBy === workspace.userId || hasEntryRole(role, 'editor');
@@ -52,19 +44,9 @@ export const RecordBody = ({ record, database, role }: RecordBodyProps) => {
[workspace.accountId, workspace.id, record.id]
);
- useEffect(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, record.id);
-
- const interval = setInterval(() => {
- radar.markEntryAsOpened(workspace.accountId, workspace.id, record.id);
- }, 60000);
-
- return () => clearInterval(interval);
- }, [record.id, record.type, record.transactionId]);
-
return (
- <Database database={database} role={role}>
- <ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
+ <RecordDatabase id={record.attributes.databaseId} role={role}>
+ <ScrollArea className="h-full max-h-full w-full overflow-y-auto">
<RecordProvider record={record} role={role}>
<RecordAttributes />
</RecordProvider>
@@ -79,6 +61,6 @@ export const RecordBody = ({ record, database, role }: RecordBodyProps) => {
autoFocus={false}
/>
</ScrollArea>
- </Database>
+ </RecordDatabase>
);
};
diff --git a/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx
index 6840d50d..9d6c84fc 100644
--- a/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx
+++ b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx
@@ -1,19 +1,32 @@
import { RecordEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface RecordBreadcrumbItemProps {
- record: RecordEntry;
+ id: string;
}
-export const RecordBreadcrumbItem = ({ record }: RecordBreadcrumbItemProps) => {
+export const RecordBreadcrumbItem = ({ id }: RecordBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+ if (!data) {
+ return null;
+ }
+ const record = data as RecordEntry;
return (
<div className="flex items-center space-x-2">
<Avatar
- size="small"
id={record.id}
name={record.attributes.name}
avatar={record.attributes.avatar}
+ className="size-4"
/>
<span>{record.attributes.name}</span>
</div>
diff --git a/apps/desktop/src/renderer/components/records/record-container-tab.tsx b/apps/desktop/src/renderer/components/records/record-container-tab.tsx
new file mode 100644
index 00000000..54ee615c
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/record-container-tab.tsx
@@ -0,0 +1,37 @@
+import { RecordEntry } from '@colanode/core';
+
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+interface RecordContainerTabProps {
+ recordId: string;
+}
+
+export const RecordContainerTab = ({ recordId }: RecordContainerTabProps) => {
+ const workspace = useWorkspace();
+
+ const { data: entry } = useQuery({
+ type: 'entry_get',
+ entryId: recordId,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const record = entry as RecordEntry;
+ if (!record) {
+ return <p>Not found</p>;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={record.id}
+ name={record.attributes.name}
+ avatar={record.attributes.avatar}
+ />
+ <span>{record.attributes.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/records/record-container.tsx b/apps/desktop/src/renderer/components/records/record-container.tsx
index 54d1f001..71cd9924 100644
--- a/apps/desktop/src/renderer/components/records/record-container.tsx
+++ b/apps/desktop/src/renderer/components/records/record-container.tsx
@@ -1,71 +1,48 @@
-import { DatabaseEntry, extractEntryRole, RecordEntry } from '@colanode/core';
+import { RecordEntry } from '@colanode/core';
-import { RecordBody } from '@/renderer/components/records/record-body';
-import { RecordHeader } from '@/renderer/components/records/record-header';
import { RecordNotFound } from '@/renderer/components/records/record-not-found';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
+import { useEntryContainer } from '@/renderer/hooks/use-entry-container';
+import { useEntryRadar } from '@/renderer/hooks/use-entry-radar';
+import {
+ Container,
+ ContainerBody,
+ ContainerHeader,
+ ContainerSettings,
+} from '@/renderer/components/ui/container';
+import { ContainerBreadcrumb } from '@/renderer/components/layouts/breadcrumbs/container-breadrumb';
+import { RecordBody } from '@/renderer/components/records/record-body';
+import { RecordSettings } from '@/renderer/components/records/record-settings';
interface RecordContainerProps {
recordId: string;
}
export const RecordContainer = ({ recordId }: RecordContainerProps) => {
- const workspace = useWorkspace();
-
- const { data: entry, isPending: isPendingEntry } = useQuery({
- type: 'entry_get',
- entryId: recordId,
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- });
-
- const record = entry as RecordEntry;
- const recordExists = !!record;
-
- const { data: root, isPending: isPendingRoot } = useQuery(
- {
- type: 'entry_get',
- entryId: record?.rootId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: recordExists,
- }
- );
-
- const { data: databaseEntry, isPending: isPendingDatabase } = useQuery(
- {
- type: 'entry_get',
- entryId: record?.attributes.databaseId ?? '',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- },
- {
- enabled: recordExists,
- }
- );
+ const data = useEntryContainer<RecordEntry>(recordId);
- const database = databaseEntry as DatabaseEntry;
+ useEntryRadar(data.entry);
- if (isPendingEntry || isPendingRoot || isPendingDatabase) {
+ if (data.isPending) {
return null;
}
- if (!record || !root || !database) {
+ if (!data.entry) {
return <RecordNotFound />;
}
- const role = extractEntryRole(root, workspace.userId);
- if (!role) {
- return <RecordNotFound />;
- }
+ const { entry: record, role } = data;
return (
- <div className="flex h-full w-full flex-col">
- <RecordHeader record={record} role={role} />
- <RecordBody record={record} database={database} role={role} />
- </div>
+ <Container>
+ <ContainerHeader>
+ <ContainerBreadcrumb breadcrumb={data.breadcrumb} />
+ <ContainerSettings>
+ <RecordSettings record={record} role={role} />
+ </ContainerSettings>
+ </ContainerHeader>
+ <ContainerBody>
+ <RecordBody record={record} role={role} />
+ </ContainerBody>
+ </Container>
);
};
diff --git a/apps/desktop/src/renderer/components/records/record-database.tsx b/apps/desktop/src/renderer/components/records/record-database.tsx
new file mode 100644
index 00000000..f43dee2b
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/record-database.tsx
@@ -0,0 +1,36 @@
+import { DatabaseEntry, EntryRole } from '@colanode/core';
+
+import { Database } from '@/renderer/components/databases/database';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+
+interface RecordDatabaseProps {
+ id: string;
+ role: EntryRole;
+ children: React.ReactNode;
+}
+
+export const RecordDatabase = ({ id, role, children }: RecordDatabaseProps) => {
+ const workspace = useWorkspace();
+
+ const { data, isPending } = useQuery({
+ type: 'entry_get',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ entryId: id,
+ });
+
+ if (isPending) {
+ return null;
+ }
+
+ if (!data) {
+ return null;
+ }
+
+ return (
+ <Database database={data as DatabaseEntry} role={role}>
+ {children}
+ </Database>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
index a15ebe25..ab9b215f 100644
--- a/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
+++ b/apps/desktop/src/renderer/components/records/record-delete-dialog.tsx
@@ -10,6 +10,7 @@ import {
import { Button } from '@/renderer/components/ui/button';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
+import { useLayout } from '@/renderer/contexts/layout';
import { toast } from '@/renderer/hooks/use-toast';
interface RecordDeleteDialogProps {
@@ -24,6 +25,7 @@ export const RecordDeleteDialog = ({
onOpenChange,
}: RecordDeleteDialogProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { mutate, isPending } = useMutation();
return (
@@ -53,7 +55,7 @@ export const RecordDeleteDialog = ({
},
onSuccess() {
onOpenChange(false);
- workspace.closeEntry(entryId);
+ layout.close(entryId);
},
onError(error) {
toast({
diff --git a/apps/desktop/src/renderer/components/records/record-header.tsx b/apps/desktop/src/renderer/components/records/record-header.tsx
deleted file mode 100644
index b7a701d2..00000000
--- a/apps/desktop/src/renderer/components/records/record-header.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { EntryRole, RecordEntry } from '@colanode/core';
-
-import { EntryBreadcrumb } from '@/renderer/components/layouts/entry-breadcrumb';
-import { EntryFullscreenButton } from '@/renderer/components/layouts/entry-fullscreen-button';
-import { RecordSettings } from '@/renderer/components/records/record-settings';
-import { Header } from '@/renderer/components/ui/header';
-import { useContainer } from '@/renderer/contexts/container';
-
-interface RecordHeaderProps {
- record: RecordEntry;
- role: EntryRole;
-}
-
-export const RecordHeader = ({ record, role }: RecordHeaderProps) => {
- const container = useContainer();
-
- return (
- <Header>
- <div className="flex w-full items-center gap-2 px-4">
- <div className="flex-grow">
- {container.mode === 'main' && <EntryBreadcrumb entry={record} />}
- {container.mode === 'modal' && (
- <EntryFullscreenButton entryId={record.id} />
- )}
- </div>
- <div className="flex items-center gap-2">
- <RecordSettings record={record} role={role} />
- </div>
- </div>
- </Header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/records/record-provider.tsx b/apps/desktop/src/renderer/components/records/record-provider.tsx
index 61a56ad8..5313c5ac 100644
--- a/apps/desktop/src/renderer/components/records/record-provider.tsx
+++ b/apps/desktop/src/renderer/components/records/record-provider.tsx
@@ -32,6 +32,7 @@ export const RecordProvider = ({
createdAt: record.createdAt,
updatedBy: record.updatedBy,
updatedAt: record.updatedAt,
+ databaseId: record.attributes.databaseId,
canEdit,
updateFieldValue: (field, value) => {
mutate({
diff --git a/apps/desktop/src/renderer/components/records/record-settings.tsx b/apps/desktop/src/renderer/components/records/record-settings.tsx
index d7b97063..1c2ae977 100644
--- a/apps/desktop/src/renderer/components/records/record-settings.tsx
+++ b/apps/desktop/src/renderer/components/records/record-settings.tsx
@@ -29,7 +29,7 @@ export const RecordSettings = ({ record, role }: RecordSettingsProps) => {
<React.Fragment>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Settings className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
+ <Settings className="size-4 cursor-pointer text-muted-foreground hover:text-foreground" />
</DropdownMenuTrigger>
<DropdownMenuContent side="bottom" className="mr-2 w-80">
<DropdownMenuLabel>{record.attributes.name}</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx
index 7cb7c330..a4ba4e8c 100644
--- a/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx
@@ -1,19 +1,34 @@
import { SpaceEntry } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface SpaceBreadcrumbItemProps {
- space: SpaceEntry;
+ id: string;
}
-export const SpaceBreadcrumbItem = ({ space }: SpaceBreadcrumbItemProps) => {
+export const SpaceBreadcrumbItem = ({ id }: SpaceBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ if (!data) {
+ return null;
+ }
+
+ const space = data as SpaceEntry;
return (
<div className="flex items-center space-x-2">
<Avatar
- size="small"
id={space.id}
name={space.attributes.name}
avatar={space.attributes.avatar}
+ className="size-4"
/>
<span>{space.attributes.name}</span>
</div>
diff --git a/apps/desktop/src/renderer/components/spaces/space-create-button.tsx b/apps/desktop/src/renderer/components/spaces/space-create-button.tsx
index 1dd1f31c..064bc9b5 100644
--- a/apps/desktop/src/renderer/components/spaces/space-create-button.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-create-button.tsx
@@ -7,10 +7,7 @@ export const SpaceCreateButton = () => {
const [open, setOpen] = React.useState(false);
return (
<React.Fragment>
- <Plus
- className="mr-2 size-4 cursor-pointer"
- onClick={() => setOpen(true)}
- />
+ <Plus className="size-4 cursor-pointer" onClick={() => setOpen(true)} />
<SpaceCreateDialog open={open} onOpenChange={setOpen} />
</React.Fragment>
);
diff --git a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
index 0f8556da..b9a7c2c3 100644
--- a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
@@ -15,7 +15,7 @@ import { Avatar } from '@/renderer/components/avatars/avatar';
import { ChannelCreateDialog } from '@/renderer/components/channels/channel-create-dialog';
import { DatabaseCreateDialog } from '@/renderer/components/databases/database-create-dialog';
import { FolderCreateDialog } from '@/renderer/components/folders/folder-create-dialog';
-import { EntrySidebarItem } from '@/renderer/components/layouts/entry-sidebar-item';
+import { SidebarItem } from '@/renderer/components/layouts/sidebars/sidebar-item';
import { PageCreateDialog } from '@/renderer/components/pages/page-create-dialog';
import { SpaceSettingsDialog } from '@/renderer/components/spaces/space-settings-dialog';
import {
@@ -34,6 +34,7 @@ import {
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
import { cn } from '@/shared/lib/utils';
+import { useLayout } from '@/renderer/contexts/layout';
interface SettingsState {
open: boolean;
@@ -46,6 +47,7 @@ interface SpaceSidebarItemProps {
export const SpaceSidebarItem = ({ space }: SpaceSidebarItemProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const { data } = useQuery({
type: 'entry_children_get',
@@ -153,18 +155,21 @@ export const SpaceSidebarItem = ({ space }: SpaceSidebarItemProps) => {
<li
key={child.id}
onClick={() => {
- workspace.openInMain(child.id);
+ layout.preview(child.id);
}}
- className="cursor-pointer"
+ onDoubleClick={() => {
+ layout.open(child.id);
+ }}
+ className="cursor-pointer select-none"
>
<div
className={cn(
'text-sm flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground',
- workspace.isEntryActive(child.id) &&
+ layout.activeTab === child.id &&
'bg-sidebar-accent text-sidebar-accent-foreground font-medium'
)}
>
- <EntrySidebarItem entry={child} />
+ <SidebarItem entry={child} />
</div>
</li>
))}
diff --git a/apps/desktop/src/renderer/components/ui/container.tsx b/apps/desktop/src/renderer/components/ui/container.tsx
new file mode 100644
index 00000000..4c0860c2
--- /dev/null
+++ b/apps/desktop/src/renderer/components/ui/container.tsx
@@ -0,0 +1,58 @@
+import { cn } from '@/shared/lib/utils';
+
+export const Container = ({
+ children,
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLDivElement>) => {
+ return (
+ <div
+ className={cn(
+ 'flex flex-col w-full h-full min-w-full min-h-full',
+ className
+ )}
+ {...props}
+ >
+ {children}
+ </div>
+ );
+};
+
+export const ContainerHeader = ({
+ children,
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLDivElement>) => {
+ return (
+ <div
+ className={cn('flex flex-row w-full items-center gap-2 px-3', className)}
+ {...props}
+ >
+ {children}
+ </div>
+ );
+};
+
+export const ContainerBody = ({
+ children,
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLDivElement>) => {
+ return (
+ <div className={cn('px-10 py-5 flex-grow', className)} {...props}>
+ {children}
+ </div>
+ );
+};
+
+export const ContainerSettings = ({
+ children,
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLDivElement>) => {
+ return (
+ <div className={cn('flex items-center gap-2', className)} {...props}>
+ {children}
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/ui/tabs.tsx b/apps/desktop/src/renderer/components/ui/tabs.tsx
index 6116517c..edfd5f3a 100644
--- a/apps/desktop/src/renderer/components/ui/tabs.tsx
+++ b/apps/desktop/src/renderer/components/ui/tabs.tsx
@@ -50,4 +50,4 @@ const TabsContent = React.forwardRef<
));
TabsContent.displayName = TabsPrimitive.Content.displayName;
-export { Tabs, TabsContent,TabsList, TabsTrigger };
+export { Tabs, TabsContent, TabsList, TabsTrigger };
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
index 8b249756..7a7ed773 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useParams, useSearchParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
import { Layout } from '@/renderer/components/layouts/layout';
import { WorkspaceSettingsDialog } from '@/renderer/components/workspaces/workspace-settings-dialog';
@@ -7,93 +7,83 @@ import { WorkspaceNotFound } from '@/renderer/components/workspaces/workspace-no
import { useAccount } from '@/renderer/contexts/account';
import { WorkspaceContext } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
+import {
+ WorkspaceMetadataKey,
+ WorkspaceMetadataMap,
+} from '@/shared/types/workspaces';
export const Workspace = () => {
const { workspaceId } = useParams<{ workspaceId: string }>();
const account = useAccount();
- const [searchParams, setSearchParams] = useSearchParams();
-
const [openSettings, setOpenSettings] = React.useState(false);
- const { data, isPending } = useQuery({
+ const { data: workspace, isPending: isPendingWorkspace } = useQuery({
type: 'workspace_get',
accountId: account.id,
workspaceId: workspaceId!,
});
- if (isPending) {
+ const { data: metadata, isPending: isPendingMetadata } = useQuery({
+ type: 'workspace_metadata_list',
+ accountId: account.id,
+ workspaceId: workspaceId!,
+ });
+
+ if (isPendingWorkspace || isPendingMetadata) {
return null;
}
- if (!data) {
+ if (!workspace) {
return <WorkspaceNotFound />;
}
- const workspace = data;
-
if (!workspace) {
- return <p>Workspace not found</p>;
+ return <WorkspaceNotFound />;
}
- const main = searchParams.get('main');
- const modal = searchParams.get('modal');
return (
<WorkspaceContext.Provider
value={{
...workspace,
- openInMain(entryId) {
- setSearchParams((prev) => {
- prev.set('main', entryId);
- if (entryId === modal) {
- prev.delete('modal');
- }
- return prev;
- });
- },
- isEntryActive(id) {
- return id === main;
- },
- isModalActive(id) {
- return id === modal;
+ openSettings() {
+ setOpenSettings(true);
},
- openInModal(modal) {
- setSearchParams((prev) => {
- prev.set('modal', modal);
- return prev;
- });
+ getMetadata<K extends WorkspaceMetadataKey>(key: K) {
+ const value = metadata?.find((m) => m.key === key);
+ if (!value) {
+ return undefined;
+ }
+
+ if (value.key !== key) {
+ return undefined;
+ }
+
+ return value as WorkspaceMetadataMap[K];
},
- closeModal() {
- setSearchParams((prev) => {
- prev.delete('modal');
- return prev;
+ setMetadata<K extends WorkspaceMetadataKey>(
+ key: K,
+ value: WorkspaceMetadataMap[K]['value']
+ ) {
+ window.colanode.executeMutation({
+ type: 'workspace_metadata_save',
+ accountId: account.id,
+ workspaceId: workspaceId!,
+ key,
+ value: JSON.stringify(value),
});
},
- closeMain() {
- setSearchParams((prev) => {
- prev.delete('main');
- return prev;
+ deleteMetadata(key: string) {
+ window.colanode.executeMutation({
+ type: 'workspace_metadata_delete',
+ accountId: account.id,
+ workspaceId: workspaceId!,
+ key,
});
},
- closeEntry(id) {
- if (id === main) {
- setSearchParams((prev) => {
- prev.delete('main');
- return prev;
- });
- } else if (id === modal) {
- setSearchParams((prev) => {
- prev.delete('modal');
- return prev;
- });
- }
- },
- openSettings() {
- setOpenSettings(true);
- },
}}
>
- <Layout main={main} modal={modal} />
+ <Layout />
{openSettings && (
<WorkspaceSettingsDialog
open={openSettings}
diff --git a/apps/desktop/src/renderer/contexts/layout.ts b/apps/desktop/src/renderer/contexts/layout.ts
new file mode 100644
index 00000000..f6a1f262
--- /dev/null
+++ b/apps/desktop/src/renderer/contexts/layout.ts
@@ -0,0 +1,20 @@
+import { createContext, useContext } from 'react';
+
+interface LayoutContextProps {
+ preview: (id: string, keepCurrent?: boolean) => void;
+ previewLeft: (id: string, keepCurrent?: boolean) => void;
+ previewRight: (id: string, keepCurrent?: boolean) => void;
+ open: (id: string) => void;
+ openLeft: (id: string) => void;
+ openRight: (id: string) => void;
+ close: (id: string) => void;
+ closeLeft: (id: string) => void;
+ closeRight: (id: string) => void;
+ activeTab?: string;
+}
+
+export const LayoutContext = createContext<LayoutContextProps>(
+ {} as LayoutContextProps
+);
+
+export const useLayout = () => useContext(LayoutContext);
diff --git a/apps/desktop/src/renderer/contexts/record.ts b/apps/desktop/src/renderer/contexts/record.ts
index 5e4a166d..94d334d2 100644
--- a/apps/desktop/src/renderer/contexts/record.ts
+++ b/apps/desktop/src/renderer/contexts/record.ts
@@ -27,6 +27,7 @@ interface RecordContext {
updatedBy?: string | null;
updatedAt?: string | null;
transactionId: string;
+ databaseId: string;
canEdit: boolean;
updateFieldValue: (field: FieldAttributes, value: FieldValue) => void;
removeFieldValue: (field: FieldAttributes) => void;
diff --git a/apps/desktop/src/renderer/contexts/workspace.ts b/apps/desktop/src/renderer/contexts/workspace.ts
index 5530126a..8985793e 100644
--- a/apps/desktop/src/renderer/contexts/workspace.ts
+++ b/apps/desktop/src/renderer/contexts/workspace.ts
@@ -1,16 +1,21 @@
import { createContext, useContext } from 'react';
-import { Workspace } from '@/shared/types/workspaces';
+import {
+ Workspace,
+ WorkspaceMetadataKey,
+ WorkspaceMetadataMap,
+} from '@/shared/types/workspaces';
interface WorkspaceContext extends Workspace {
- openInMain: (entryId: string) => void;
- isEntryActive: (entryId: string) => boolean;
- openInModal: (entryId: string) => void;
- isModalActive: (entryId: string) => boolean;
- closeModal: () => void;
- closeMain: () => void;
- closeEntry: (entryId: string) => void;
openSettings: () => void;
+ getMetadata: <K extends WorkspaceMetadataKey>(
+ key: K
+ ) => WorkspaceMetadataMap[K] | undefined;
+ setMetadata: <K extends WorkspaceMetadataKey>(
+ key: K,
+ value: WorkspaceMetadataMap[K]['value']
+ ) => void;
+ deleteMetadata: <K extends WorkspaceMetadataKey>(key: K) => void;
}
export const WorkspaceContext = createContext<WorkspaceContext>(
diff --git a/apps/desktop/src/renderer/editor/views/database.tsx b/apps/desktop/src/renderer/editor/views/database.tsx
index a8b3ff36..cb4a462e 100644
--- a/apps/desktop/src/renderer/editor/views/database.tsx
+++ b/apps/desktop/src/renderer/editor/views/database.tsx
@@ -4,9 +4,11 @@ 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';
+import { useLayout } from '@/renderer/contexts/layout';
export const DatabaseNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const id = node.attrs.id;
const { data } = useQuery({
@@ -32,7 +34,7 @@ export const DatabaseNodeView = ({ node }: NodeViewProps) => {
data-id={node.attrs.id}
className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
onClick={() => {
- workspace.openInMain(id);
+ layout.previewLeft(id, true);
}}
>
<Avatar size="small" id={id} name={name} avatar={avatar} />
diff --git a/apps/desktop/src/renderer/editor/views/folder.tsx b/apps/desktop/src/renderer/editor/views/folder.tsx
index 64e3cd44..5b37e35f 100644
--- a/apps/desktop/src/renderer/editor/views/folder.tsx
+++ b/apps/desktop/src/renderer/editor/views/folder.tsx
@@ -4,9 +4,11 @@ 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';
+import { useLayout } from '@/renderer/contexts/layout';
export const FolderNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const id = node.attrs.id;
const { data } = useQuery({
@@ -32,7 +34,7 @@ export const FolderNodeView = ({ node }: NodeViewProps) => {
data-id={node.attrs.id}
className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
onClick={() => {
- workspace.openInMain(id);
+ layout.previewLeft(id, true);
}}
>
<Avatar size="small" id={id} name={name} avatar={avatar} />
diff --git a/apps/desktop/src/renderer/editor/views/page.tsx b/apps/desktop/src/renderer/editor/views/page.tsx
index d459f8d1..fb5a39d4 100644
--- a/apps/desktop/src/renderer/editor/views/page.tsx
+++ b/apps/desktop/src/renderer/editor/views/page.tsx
@@ -4,9 +4,11 @@ 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';
+import { useLayout } from '@/renderer/contexts/layout';
export const PageNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
+ const layout = useLayout();
const id = node.attrs.id;
const { data } = useQuery({
@@ -32,7 +34,7 @@ export const PageNodeView = ({ node }: NodeViewProps) => {
data-id={node.attrs.id}
className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
onClick={() => {
- workspace.openInMain(id);
+ layout.previewLeft(id, true);
}}
>
<Avatar size="small" id={id} name={name} avatar={avatar} />
diff --git a/apps/desktop/src/renderer/hooks/use-entry-container.tsx b/apps/desktop/src/renderer/hooks/use-entry-container.tsx
new file mode 100644
index 00000000..eeb67d66
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/use-entry-container.tsx
@@ -0,0 +1,109 @@
+import { Entry, EntryRole, extractEntryRole } from '@colanode/core';
+
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+
+type UseEntryContainerResult<T extends Entry> =
+ | {
+ isPending: true;
+ entry: null;
+ }
+ | {
+ isPending: false;
+ entry: null;
+ }
+ | {
+ isPending: false;
+ entry: T;
+ breadcrumb: string[];
+ root: Entry;
+ role: EntryRole;
+ };
+
+export const useEntryContainer = <T extends Entry>(
+ id: string
+): UseEntryContainerResult<T> => {
+ const workspace = useWorkspace();
+
+ const { data: entryData, isPending: isPendingEntry } = useQuery({
+ type: 'entry_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const entryExists = !!entryData;
+ const isRoot = entryData?.rootId === id;
+
+ const { data: rootData, isPending: isPendingRoot } = useQuery(
+ {
+ type: 'entry_get',
+ entryId: entryData?.rootId ?? '',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ },
+ {
+ enabled: entryExists && !isRoot,
+ }
+ );
+
+ const { data: breadcrumbData, isPending: isPendingBreadcrumb } = useQuery(
+ {
+ type: 'entry_breadcrumb_get',
+ entryId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ },
+ {
+ enabled: entryExists && !isRoot,
+ }
+ );
+
+ const isPending =
+ isPendingEntry ||
+ (entryExists && !isRoot && (isPendingRoot || isPendingBreadcrumb));
+
+ if (isPending) {
+ return { isPending: true, entry: null };
+ }
+
+ if (!entryExists) {
+ return { isPending: false, entry: null };
+ }
+
+ if (isRoot) {
+ const role = extractEntryRole(entryData, workspace.userId);
+ if (!role) {
+ return { isPending: false, entry: null };
+ }
+
+ return {
+ isPending: false,
+ entry: entryData as T,
+ root: entryData,
+ breadcrumb: [entryData.id],
+ role,
+ };
+ }
+
+ if (!rootData) {
+ return { isPending: false, entry: null };
+ }
+
+ if (!breadcrumbData || breadcrumbData.length === 0) {
+ return { isPending: false, entry: null };
+ }
+
+ const role = extractEntryRole(rootData, workspace.userId);
+ if (!role) {
+ return { isPending: false, entry: null };
+ }
+
+ return {
+ isPending: false,
+ entry: entryData as T,
+ root: rootData,
+ breadcrumb: breadcrumbData,
+ role,
+ };
+};
diff --git a/apps/desktop/src/renderer/hooks/use-entry-radar.tsx b/apps/desktop/src/renderer/hooks/use-entry-radar.tsx
new file mode 100644
index 00000000..6ca518a6
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/use-entry-radar.tsx
@@ -0,0 +1,24 @@
+import { Entry } from '@colanode/core';
+import { useEffect } from 'react';
+
+import { useRadar } from '@/renderer/contexts/radar';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+
+export const useEntryRadar = (entry: Entry | null) => {
+ const workspace = useWorkspace();
+ const radar = useRadar();
+
+ useEffect(() => {
+ if (!entry) {
+ return;
+ }
+
+ radar.markEntryAsOpened(workspace.accountId, workspace.id, entry.id);
+
+ const interval = setInterval(() => {
+ radar.markEntryAsOpened(workspace.accountId, workspace.id, entry.id);
+ }, 60000);
+
+ return () => clearInterval(interval);
+ }, [entry?.id]);
+};
diff --git a/apps/desktop/src/renderer/hooks/use-file-container.tsx b/apps/desktop/src/renderer/hooks/use-file-container.tsx
new file mode 100644
index 00000000..ba3d1675
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/use-file-container.tsx
@@ -0,0 +1,91 @@
+import { Entry, EntryRole, extractEntryRole } from '@colanode/core';
+
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { FileWithState } from '@/shared/types/files';
+
+type UseFileContainerResult =
+ | {
+ isPending: true;
+ file: null;
+ }
+ | {
+ isPending: false;
+ file: null;
+ }
+ | {
+ isPending: false;
+ file: FileWithState;
+ breadcrumb: string[];
+ root: Entry;
+ role: EntryRole;
+ };
+
+export const useFileContainer = (id: string): UseFileContainerResult => {
+ const workspace = useWorkspace();
+
+ const { data: fileData, isPending: isPendingFile } = useQuery({
+ type: 'file_get',
+ id: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ });
+
+ const fileExists = !!fileData;
+
+ const { data: rootData, isPending: isPendingRoot } = useQuery(
+ {
+ type: 'entry_get',
+ entryId: fileData?.rootId ?? '',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ },
+ {
+ enabled: fileExists,
+ }
+ );
+
+ const { data: breadcrumbData, isPending: isPendingBreadcrumb } = useQuery(
+ {
+ type: 'file_breadcrumb_get',
+ fileId: id,
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ },
+ {
+ enabled: fileExists,
+ }
+ );
+
+ const isPending =
+ isPendingFile || (fileExists && (isPendingRoot || isPendingBreadcrumb));
+
+ if (isPending) {
+ return { isPending: true, file: null };
+ }
+
+ if (!fileExists) {
+ return { isPending: false, file: null };
+ }
+
+ if (!rootData) {
+ return { isPending: false, file: null };
+ }
+
+ if (!breadcrumbData || breadcrumbData.length === 0) {
+ return { isPending: false, file: null };
+ }
+
+ const role = extractEntryRole(rootData, workspace.userId);
+ if (!role) {
+ return { isPending: false, file: null };
+ }
+
+ return {
+ isPending: false,
+ file: fileData,
+ root: rootData,
+ breadcrumb: breadcrumbData,
+ role,
+ };
+};
diff --git a/apps/desktop/src/renderer/hooks/use-toast.ts b/apps/desktop/src/renderer/hooks/use-toast.tsx
similarity index 99%
rename from apps/desktop/src/renderer/hooks/use-toast.ts
rename to apps/desktop/src/renderer/hooks/use-toast.tsx
index 213b5a03..d30fa595 100644
--- a/apps/desktop/src/renderer/hooks/use-toast.ts
+++ b/apps/desktop/src/renderer/hooks/use-toast.tsx
@@ -187,4 +187,4 @@ const useToast = () => {
};
};
-export { toast,useToast };
+export { toast, useToast };
diff --git a/apps/desktop/src/renderer/hooks/use-window-size.tsx b/apps/desktop/src/renderer/hooks/use-window-size.tsx
new file mode 100644
index 00000000..5706b9c1
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/use-window-size.tsx
@@ -0,0 +1,29 @@
+import { useState, useEffect } from 'react';
+
+type WindowSizeType = {
+ width: number;
+ height: number;
+};
+
+const useWindowSize = () => {
+ const [windowSize, setWindowSize] = useState<WindowSizeType>({
+ width: window.innerWidth,
+ height: window.innerHeight,
+ });
+
+ useEffect(() => {
+ function handleResize() {
+ setWindowSize({
+ width: window.innerWidth,
+ height: window.innerHeight,
+ });
+ }
+
+ window.addEventListener('resize', handleResize);
+ return () => window.removeEventListener('resize', handleResize);
+ }, []);
+
+ return windowSize;
+};
+
+export { useWindowSize };
diff --git a/apps/desktop/src/renderer/hooks/user-layout-state.tsx b/apps/desktop/src/renderer/hooks/user-layout-state.tsx
new file mode 100644
index 00000000..980b3cc0
--- /dev/null
+++ b/apps/desktop/src/renderer/hooks/user-layout-state.tsx
@@ -0,0 +1,424 @@
+import { useCallback, useState } from 'react';
+
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { percentToNumber } from '@/shared/lib/utils';
+import { useWindowSize } from '@/renderer/hooks/use-window-size';
+import {
+ ContainerMetadata,
+ SidebarMenuType,
+ SidebarMetadata,
+} from '@/shared/types/workspaces';
+
+export const useLayoutState = () => {
+ const workspace = useWorkspace();
+ const windowSize = useWindowSize();
+
+ const [activeContainer, setActiveContainer] = useState<'left' | 'right'>(
+ 'left'
+ );
+
+ const [sidebarMetadata, setSidebarMetadata] = useState<SidebarMetadata>(
+ workspace.getMetadata('sidebar')?.value ?? {
+ menu: 'spaces',
+ width: 300,
+ }
+ );
+
+ const [leftContainerMetadata, setLeftContainerMetadata] =
+ useState<ContainerMetadata>(
+ workspace.getMetadata('left_container')?.value ?? {
+ tabs: [],
+ }
+ );
+
+ const replaceLeftContainerMetadata = useCallback(
+ (metadata: ContainerMetadata) => {
+ setLeftContainerMetadata(metadata);
+ workspace.setMetadata('left_container', {
+ ...metadata,
+ });
+ },
+ [workspace, setLeftContainerMetadata]
+ );
+
+ const [rightContainerMetadata, setRightContainerMetadata] =
+ useState<ContainerMetadata>(
+ workspace.getMetadata('right_container')?.value ?? {
+ tabs: [],
+ width: percentToNumber(windowSize.width, 40),
+ }
+ );
+
+ const replaceRightContainerMetadata = useCallback(
+ (metadata: ContainerMetadata) => {
+ setRightContainerMetadata(metadata);
+ workspace.setMetadata('right_container', {
+ ...metadata,
+ });
+ },
+ [workspace, setRightContainerMetadata]
+ );
+
+ const handleSidebarResize = useCallback(
+ (width: number) => {
+ setSidebarMetadata({
+ ...sidebarMetadata,
+ width,
+ });
+
+ workspace.setMetadata('sidebar', {
+ ...sidebarMetadata,
+ width,
+ });
+ },
+ [workspace, sidebarMetadata]
+ );
+
+ const handleMenuChange = useCallback(
+ (menu: SidebarMenuType) => {
+ setSidebarMetadata({
+ ...sidebarMetadata,
+ menu,
+ });
+
+ workspace.setMetadata('sidebar', {
+ ...sidebarMetadata,
+ menu,
+ });
+ },
+ [workspace, sidebarMetadata]
+ );
+
+ const handleRightContainerResize = useCallback(
+ (width: number) => {
+ setRightContainerMetadata({
+ ...rightContainerMetadata,
+ width,
+ });
+
+ workspace.setMetadata('right_container', {
+ ...rightContainerMetadata,
+ width,
+ });
+ },
+ [workspace, rightContainerMetadata]
+ );
+
+ const handleOpenLeft = useCallback(
+ (tab: string) => {
+ const existingTab = leftContainerMetadata.tabs.find((t) => t.id === tab);
+ if (existingTab) {
+ replaceLeftContainerMetadata({
+ ...leftContainerMetadata,
+ tabs: leftContainerMetadata.tabs.map((t) => ({
+ ...t,
+ active: t.id === tab ? true : undefined,
+ preview: t.id === tab ? undefined : t.preview,
+ })),
+ });
+ } else {
+ replaceLeftContainerMetadata({
+ ...leftContainerMetadata,
+ tabs: [
+ ...leftContainerMetadata.tabs
+ .filter((t) => t.id !== tab)
+ .map((t) => ({
+ ...t,
+ active: undefined,
+ })),
+ { id: tab, active: true },
+ ],
+ });
+ }
+ },
+ [leftContainerMetadata]
+ );
+
+ const handleOpenRight = useCallback(
+ (tab: string) => {
+ const existingTab = rightContainerMetadata.tabs.find((t) => t.id === tab);
+ if (existingTab) {
+ replaceRightContainerMetadata({
+ ...rightContainerMetadata,
+ tabs: rightContainerMetadata.tabs.map((t) => ({
+ ...t,
+ active: t.id === tab ? true : undefined,
+ preview: t.id === tab ? undefined : t.preview,
+ })),
+ });
+ } else {
+ replaceRightContainerMetadata({
+ ...rightContainerMetadata,
+ tabs: [
+ ...rightContainerMetadata.tabs
+ .filter((t) => t.id !== tab)
+ .map((t) => ({
+ ...t,
+ active: undefined,
+ })),
+ { id: tab, active: true },
+ ],
+ });
+ }
+ },
+ [rightContainerMetadata]
+ );
+
+ const handleOpen = useCallback(
+ (tab: string) => {
+ if (activeContainer === 'left') {
+ handleOpenLeft(tab);
+ } else {
+ handleOpenRight(tab);
+ }
+ },
+ [activeContainer, handleOpenLeft, handleOpenRight]
+ );
+
+ const handleCloseLeft = useCallback(
+ (tab: string) => {
+ const existingTabIndex = leftContainerMetadata.tabs.findIndex(
+ (t) => t.id === tab
+ );
+
+ if (existingTabIndex === -1) {
+ return;
+ }
+
+ const newTabs = leftContainerMetadata.tabs.filter((t) => t.id !== tab);
+
+ // Make the closest tab active, preferring the previous tab
+ if (newTabs.length > 0 && !newTabs.some((t) => t.active)) {
+ const nextActiveTab =
+ newTabs[existingTabIndex - 1] ||
+ newTabs[existingTabIndex] ||
+ newTabs[0];
+
+ newTabs.forEach((t) => {
+ t.active = t.id === nextActiveTab?.id;
+ });
+ }
+
+ replaceLeftContainerMetadata({
+ ...leftContainerMetadata,
+ tabs: newTabs,
+ });
+
+ // if the left container is empty, but the right container has tabs,
+ // move all tabs from the right container to the left container
+ if (newTabs.length === 0 && rightContainerMetadata.tabs.length > 0) {
+ replaceLeftContainerMetadata({
+ ...leftContainerMetadata,
+ tabs: rightContainerMetadata.tabs,
+ });
+
+ replaceRightContainerMetadata({
+ ...rightContainerMetadata,
+ tabs: [],
+ });
+
+ setActiveContainer('left');
+ }
+ },
+ [leftContainerMetadata, rightContainerMetadata, activeContainer]
+ );
+
+ const handleCloseRight = useCallback(
+ (tab: string) => {
+ const existingTabIndex = rightContainerMetadata.tabs.findIndex(
+ (t) => t.id === tab
+ );
+
+ if (existingTabIndex === -1) {
+ return;
+ }
+
+ const newTabs = rightContainerMetadata.tabs.filter((t) => t.id !== tab);
+
+ // Make the closest tab active, preferring the previous tab
+ if (newTabs.length > 0 && !newTabs.some((t) => t.active)) {
+ const nextActiveTab =
+ newTabs[existingTabIndex - 1] ||
+ newTabs[existingTabIndex] ||
+ newTabs[0];
+
+ newTabs.forEach((t) => {
+ t.active = t.id === nextActiveTab?.id;
+ });
+ }
+
+ replaceRightContainerMetadata({
+ ...rightContainerMetadata,
+ tabs: newTabs,
+ });
+
+ if (newTabs.length === 0) {
+ setActiveContainer('left');
+ }
+ },
+ [rightContainerMetadata]
+ );
+
+ const handleClose = useCallback(
+ (tab: string) => {
+ handleCloseLeft(tab);
+ handleCloseRight(tab);
+ },
+ [handleCloseLeft, handleCloseRight]
+ );
+
+ const handlePreviewLeft = useCallback(
+ (tab: string, keepCurrent: boolean = false) => {
+ const existingTab = leftContainerMetadata.tabs.find((t) => t.id === tab);
+ if (existingTab) {
+ if (!existingTab.active) {
+ replaceLeftContainerMetadata({
+ ...leftContainerMetadata,
+ tabs: leftContainerMetadata.tabs
+ .filter((t) => keepCurrent || !t.preview)
+ .map((t) => ({
+ ...t,
+ active: t.id === tab ? true : undefined,
+ })),
+ });
+ }
+
+ return;
+ }
+
+ replaceLeftContainerMetadata({
+ ...leftContainerMetadata,
+ tabs: [
+ ...leftContainerMetadata.tabs
+ .filter((t) => keepCurrent || !t.preview)
+ .map((t) => ({
+ ...t,
+ active: undefined,
+ preview: undefined,
+ })),
+ { id: tab, active: true, preview: true },
+ ],
+ });
+ },
+ [leftContainerMetadata]
+ );
+
+ const handlePreviewRight = useCallback(
+ (tab: string, keepCurrent: boolean = false) => {
+ const existingTab = rightContainerMetadata.tabs.find((t) => t.id === tab);
+ if (existingTab) {
+ if (!existingTab.active) {
+ replaceRightContainerMetadata({
+ ...rightContainerMetadata,
+ tabs: rightContainerMetadata.tabs
+ .filter((t) => keepCurrent || !t.preview)
+ .map((t) => ({
+ ...t,
+ active: t.id === tab ? true : undefined,
+ })),
+ });
+ }
+
+ return;
+ }
+
+ replaceRightContainerMetadata({
+ ...rightContainerMetadata,
+ tabs: [
+ ...rightContainerMetadata.tabs
+ .filter((t) => keepCurrent || !t.preview)
+ .map((t) => ({
+ ...t,
+ active: undefined,
+ preview: true,
+ })),
+ { id: tab, active: true, preview: true },
+ ],
+ });
+ },
+ [rightContainerMetadata]
+ );
+
+ const handlePreview = useCallback(
+ (tab: string, keepCurrent: boolean = false) => {
+ if (activeContainer === 'left') {
+ handlePreviewLeft(tab, keepCurrent);
+ } else {
+ handlePreviewRight(tab, keepCurrent);
+ }
+ },
+ [activeContainer, handlePreviewLeft, handlePreviewRight]
+ );
+
+ const handleActivateLeft = useCallback(
+ (tab: string) => {
+ if (!leftContainerMetadata.tabs.some((t) => t.id === tab)) {
+ return;
+ }
+
+ replaceLeftContainerMetadata({
+ ...leftContainerMetadata,
+ tabs: leftContainerMetadata.tabs.map((t) => ({
+ ...t,
+ active: t.id === tab ? true : undefined,
+ })),
+ });
+ },
+ [leftContainerMetadata]
+ );
+
+ const handleActivateRight = useCallback(
+ (tab: string) => {
+ if (!rightContainerMetadata.tabs.some((t) => t.id === tab)) {
+ return;
+ }
+
+ replaceRightContainerMetadata({
+ ...rightContainerMetadata,
+ tabs: rightContainerMetadata.tabs.map((t) => ({
+ ...t,
+ active: t.id === tab ? true : undefined,
+ })),
+ });
+ },
+ [rightContainerMetadata]
+ );
+
+ const handleActivate = useCallback(
+ (tab: string) => {
+ if (activeContainer === 'left') {
+ handleActivateLeft(tab);
+ } else {
+ handleActivateRight(tab);
+ }
+ },
+ [activeContainer, handleActivateLeft, handleActivateRight]
+ );
+
+ const handleFocus = useCallback((side: 'left' | 'right') => {
+ setActiveContainer(side);
+ }, []);
+
+ return {
+ activeContainer,
+ sidebarMetadata,
+ leftContainerMetadata,
+ rightContainerMetadata,
+ handleFocus,
+ handleOpen,
+ handleOpenLeft,
+ handleOpenRight,
+ handleClose,
+ handleCloseLeft,
+ handleCloseRight,
+ handlePreview,
+ handlePreviewLeft,
+ handlePreviewRight,
+ handleSidebarResize,
+ handleMenuChange,
+ handleRightContainerResize,
+ handleActivate,
+ handleActivateLeft,
+ handleActivateRight,
+ };
+};
diff --git a/apps/desktop/src/shared/lib/utils.ts b/apps/desktop/src/shared/lib/utils.ts
index 44a92862..8ba51b8b 100644
--- a/apps/desktop/src/shared/lib/utils.ts
+++ b/apps/desktop/src/shared/lib/utils.ts
@@ -49,3 +49,9 @@ export const getDisplayedDates = (
export const pluralize = (count: number, singular: string, plural: string) =>
count === 1 ? singular : plural;
+
+export const percentToNumber = (total: number, percent: number) =>
+ Math.round((total * percent) / 100);
+
+export const numberToPercent = (total: number, number: number) =>
+ Math.round((number / total) * 100);
diff --git a/apps/desktop/src/shared/mutations/workspaces/workspace-metadata-delete.ts b/apps/desktop/src/shared/mutations/workspaces/workspace-metadata-delete.ts
new file mode 100644
index 00000000..85d530e2
--- /dev/null
+++ b/apps/desktop/src/shared/mutations/workspaces/workspace-metadata-delete.ts
@@ -0,0 +1,19 @@
+export type WorkspaceMetadataDeleteMutationInput = {
+ type: 'workspace_metadata_delete';
+ accountId: string;
+ workspaceId: string;
+ key: string;
+};
+
+export type WorkspaceMetadataDeleteMutationOutput = {
+ success: boolean;
+};
+
+declare module '@/shared/mutations' {
+ interface MutationMap {
+ workspace_metadata_delete: {
+ input: WorkspaceMetadataDeleteMutationInput;
+ output: WorkspaceMetadataDeleteMutationOutput;
+ };
+ }
+}
diff --git a/apps/desktop/src/shared/mutations/workspaces/workspace-metadata-save.ts b/apps/desktop/src/shared/mutations/workspaces/workspace-metadata-save.ts
new file mode 100644
index 00000000..c261c5f6
--- /dev/null
+++ b/apps/desktop/src/shared/mutations/workspaces/workspace-metadata-save.ts
@@ -0,0 +1,20 @@
+export type WorkspaceMetadataSaveMutationInput = {
+ type: 'workspace_metadata_save';
+ accountId: string;
+ workspaceId: string;
+ key: string;
+ value: string;
+};
+
+export type WorkspaceMetadataSaveMutationOutput = {
+ success: boolean;
+};
+
+declare module '@/shared/mutations' {
+ interface MutationMap {
+ workspace_metadata_save: {
+ input: WorkspaceMetadataSaveMutationInput;
+ output: WorkspaceMetadataSaveMutationOutput;
+ };
+ }
+}
diff --git a/apps/desktop/src/shared/queries/entries/entry-breadcrumb-get.ts b/apps/desktop/src/shared/queries/entries/entry-breadcrumb-get.ts
new file mode 100644
index 00000000..af79adbc
--- /dev/null
+++ b/apps/desktop/src/shared/queries/entries/entry-breadcrumb-get.ts
@@ -0,0 +1,15 @@
+export type EntryBreadcrumbGetQueryInput = {
+ type: 'entry_breadcrumb_get';
+ entryId: string;
+ accountId: string;
+ workspaceId: string;
+};
+
+declare module '@/shared/queries' {
+ interface QueryMap {
+ entry_breadcrumb_get: {
+ input: EntryBreadcrumbGetQueryInput;
+ output: string[];
+ };
+ }
+}
diff --git a/apps/desktop/src/shared/queries/files/file-breadcrumb-get.ts b/apps/desktop/src/shared/queries/files/file-breadcrumb-get.ts
new file mode 100644
index 00000000..4ce9fff0
--- /dev/null
+++ b/apps/desktop/src/shared/queries/files/file-breadcrumb-get.ts
@@ -0,0 +1,15 @@
+export type FileBreadcrumbGetQueryInput = {
+ type: 'file_breadcrumb_get';
+ fileId: string;
+ accountId: string;
+ workspaceId: string;
+};
+
+declare module '@/shared/queries' {
+ interface QueryMap {
+ file_breadcrumb_get: {
+ input: FileBreadcrumbGetQueryInput;
+ output: string[];
+ };
+ }
+}
diff --git a/apps/desktop/src/shared/queries/messages/message-breadcrumb-get.ts b/apps/desktop/src/shared/queries/messages/message-breadcrumb-get.ts
new file mode 100644
index 00000000..3aceac3e
--- /dev/null
+++ b/apps/desktop/src/shared/queries/messages/message-breadcrumb-get.ts
@@ -0,0 +1,15 @@
+export type MessageBreadcrumbGetQueryInput = {
+ type: 'message_breadcrumb_get';
+ messageId: string;
+ accountId: string;
+ workspaceId: string;
+};
+
+declare module '@/shared/queries' {
+ interface QueryMap {
+ message_breadcrumb_get: {
+ input: MessageBreadcrumbGetQueryInput;
+ output: string[];
+ };
+ }
+}
diff --git a/apps/desktop/src/shared/queries/workspaces/workspace-metadata-list.ts b/apps/desktop/src/shared/queries/workspaces/workspace-metadata-list.ts
new file mode 100644
index 00000000..552c8a3d
--- /dev/null
+++ b/apps/desktop/src/shared/queries/workspaces/workspace-metadata-list.ts
@@ -0,0 +1,16 @@
+import { WorkspaceMetadata } from '@/shared/types/workspaces';
+
+export type WorkspaceMetadataListQueryInput = {
+ type: 'workspace_metadata_list';
+ accountId: string;
+ workspaceId: string;
+};
+
+declare module '@/shared/queries' {
+ interface QueryMap {
+ workspace_metadata_list: {
+ input: WorkspaceMetadataListQueryInput;
+ output: WorkspaceMetadata[];
+ };
+ }
+}
diff --git a/apps/desktop/src/shared/types/events.ts b/apps/desktop/src/shared/types/events.ts
index 1a2b9d86..830c0c1e 100644
--- a/apps/desktop/src/shared/types/events.ts
+++ b/apps/desktop/src/shared/types/events.ts
@@ -8,7 +8,7 @@ import {
} from '@/shared/types/messages';
import { Account } from '@/shared/types/accounts';
import { Server } from '@/shared/types/servers';
-import { Workspace } from '@/shared/types/workspaces';
+import { Workspace, WorkspaceMetadata } from '@/shared/types/workspaces';
import { User } from '@/shared/types/users';
import { File, FileInteraction, FileState } from '@/shared/types/files';
@@ -238,6 +238,20 @@ export type AccountConnectionMessageEvent = {
message: Message;
};
+export type WorkspaceMetadataUpdatedEvent = {
+ type: 'workspace_metadata_updated';
+ accountId: string;
+ workspaceId: string;
+ metadata: WorkspaceMetadata;
+};
+
+export type WorkspaceMetadataDeletedEvent = {
+ type: 'workspace_metadata_deleted';
+ accountId: string;
+ workspaceId: string;
+ metadata: WorkspaceMetadata;
+};
+
export type Event =
| UserCreatedEvent
| UserUpdatedEvent
@@ -274,4 +288,6 @@ export type Event =
| CollaborationDeletedEvent
| AccountConnectionOpenedEvent
| AccountConnectionClosedEvent
- | AccountConnectionMessageEvent;
+ | AccountConnectionMessageEvent
+ | WorkspaceMetadataUpdatedEvent
+ | WorkspaceMetadataDeletedEvent;
diff --git a/apps/desktop/src/shared/types/workspaces.ts b/apps/desktop/src/shared/types/workspaces.ts
index 0b277cd6..c82d65d7 100644
--- a/apps/desktop/src/shared/types/workspaces.ts
+++ b/apps/desktop/src/shared/types/workspaces.ts
@@ -11,3 +11,55 @@ export type Workspace = {
maxFileSize: bigint;
storageLimit: bigint;
};
+
+export type ContainerTab = {
+ id: string;
+ preview?: boolean;
+ active?: boolean;
+};
+
+export type ContainerMetadata = {
+ tabs: ContainerTab[];
+ width?: number;
+};
+
+export type SidebarMenuType = 'chats' | 'spaces';
+
+export type SidebarMetadata = {
+ menu: SidebarMenuType;
+ width: number;
+};
+
+export type WorkspaceSidebarMetadata = {
+ key: 'sidebar';
+ value: SidebarMetadata;
+ createdAt: string;
+ updatedAt: string | null;
+};
+
+export type WorkspaceLeftContainerMetadata = {
+ key: 'left_container';
+ value: ContainerMetadata;
+ createdAt: string;
+ updatedAt: string | null;
+};
+
+export type WorkspaceRightContainerMetadata = {
+ key: 'right_container';
+ value: ContainerMetadata;
+ createdAt: string;
+ updatedAt: string | null;
+};
+
+export type WorkspaceMetadata =
+ | WorkspaceSidebarMetadata
+ | WorkspaceRightContainerMetadata
+ | WorkspaceLeftContainerMetadata;
+
+export type WorkspaceMetadataKey = WorkspaceMetadata['key'];
+
+export type WorkspaceMetadataMap = {
+ sidebar: WorkspaceSidebarMetadata;
+ right_container: WorkspaceRightContainerMetadata;
+ left_container: WorkspaceLeftContainerMetadata;
+};
diff --git a/package-lock.json b/package-lock.json
index 9721b038..5cfe7f3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -93,7 +93,7 @@
"lowlight": "^3.2.0",
"lucide-react": "^0.473.0",
"mime-types": "^2.1.35",
- "re-resizable": "^6.10.1",
+ "re-resizable": "^6.10.3",
"react": "^18.3.1",
"react-day-picker": "^8.10.1",
"react-dnd": "^16.0.1",