Skip to content

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

Refactor container and header

Hakan Shehu1bf0d3405f15
diff --git a/apps/desktop/src/lib/nodes.ts b/apps/desktop/src/lib/nodes.ts
index adb2f918..6a329611 100644
--- a/apps/desktop/src/lib/nodes.ts
+++ b/apps/desktop/src/lib/nodes.ts
@@ -1,5 +1,6 @@
import { generateKeyBetween } from 'fractional-indexing-jittered';
-import { NodeTypes } from '@colanode/core';
+import { extractNodeCollaborators, Node, NodeTypes } from '@colanode/core';
+import { NodeCollaborator } from '@/types/nodes';
export const generateNodeIndex = (
previous?: string | null,
@@ -29,3 +30,21 @@ export const getDefaultNodeIcon = (type: string) => {
return 'file-unknown-line';
}
};
+
+export const buildNodeCollaborators = (nodes: Node[]): NodeCollaborator[] => {
+ const collaborators: Record<string, NodeCollaborator> = {};
+
+ for (const node of nodes) {
+ const nodeCollaborators = extractNodeCollaborators(node.attributes);
+
+ for (const [collaboratorId, role] of Object.entries(nodeCollaborators)) {
+ collaborators[collaboratorId] = {
+ nodeId: node.id,
+ collaboratorId,
+ role,
+ };
+ }
+ }
+
+ return Object.values(collaborators);
+};
diff --git a/apps/desktop/src/main/handlers/queries/chat-get.ts b/apps/desktop/src/main/handlers/queries/chat-get.ts
deleted file mode 100644
index 6887cb9c..00000000
--- a/apps/desktop/src/main/handlers/queries/chat-get.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { ChatGetQueryInput } from '@/operations/queries/chat-get';
-import { databaseManager } from '@/main/data/database-manager';
-import { mapNode } from '@/main/utils';
-import { SelectNode } from '@/main/data/workspace/schema';
-import {
- MutationChange,
- ChangeCheckResult,
- QueryHandler,
- QueryResult,
-} from '@/main/types';
-import { isEqual } from 'lodash-es';
-import { ChatNode } from '@/types/chats';
-
-export class ChatGetQueryHandler implements QueryHandler<ChatGetQueryInput> {
- async handleQuery(
- input: ChatGetQueryInput
- ): Promise<QueryResult<ChatGetQueryInput>> {
- const chat = await this.fetchChat(input);
- if (!chat) {
- return {
- output: null,
- state: {},
- };
- }
-
- const collaborators = await this.fetchCollaborators(input, chat);
- return {
- output: this.buildChat(chat, collaborators),
- state: {
- chat,
- collaborators,
- },
- };
- }
-
- async checkForChanges(
- changes: MutationChange[],
- input: ChatGetQueryInput,
- state: Record<string, any>
- ): Promise<ChangeCheckResult<ChatGetQueryInput>> {
- if (
- !changes.some(
- (change) =>
- change.type === 'workspace' &&
- change.table === 'nodes' &&
- change.userId === input.userId
- )
- ) {
- return {
- hasChanges: false,
- };
- }
-
- const chat = await this.fetchChat(input);
- if (!chat) {
- return {
- hasChanges: true,
- result: {
- output: null,
- state: {},
- },
- };
- }
-
- const collaborators = await this.fetchCollaborators(input, chat);
-
- if (
- isEqual(chat, state.chat) &&
- isEqual(collaborators, state.collaborators)
- ) {
- return {
- hasChanges: false,
- };
- }
-
- return {
- hasChanges: true,
- result: {
- output: this.buildChat(chat, collaborators),
- state: {
- chat,
- collaborators,
- },
- },
- };
- }
-
- private async fetchChat(
- input: ChatGetQueryInput
- ): Promise<SelectNode | null> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
- const chat = await workspaceDatabase
- .selectFrom('nodes')
- .where('id', '=', input.chatId)
- .selectAll()
- .executeTakeFirst();
-
- return chat ?? null;
- }
-
- private async fetchCollaborators(
- input: ChatGetQueryInput,
- chat: SelectNode
- ): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
- if (!chat.attributes) {
- return [];
- }
-
- const attributes = JSON.parse(chat.attributes);
- if (!attributes.collaborators) {
- return [];
- }
-
- const collaboratorIds: string[] = [];
- if (attributes.collaborators) {
- for (const collaboratorId of Object.keys(attributes.collaborators)) {
- if (collaboratorId === input.userId) {
- continue;
- }
-
- if (collaboratorIds.includes(collaboratorId)) {
- continue;
- }
-
- collaboratorIds.push(collaboratorId);
- }
- }
-
- const collaborators = await workspaceDatabase
- .selectFrom('nodes')
- .where('id', 'in', collaboratorIds)
- .selectAll()
- .execute();
-
- return collaborators;
- }
-
- private buildChat = (
- chat: SelectNode,
- collaborators: SelectNode[]
- ): ChatNode | null => {
- const collaborator = mapNode(collaborators[0]);
- if (collaborator.attributes.type !== 'user') {
- return null;
- }
-
- return {
- id: chat.id,
- name: collaborator.attributes.name ?? 'Unknown',
- avatar: collaborator.attributes.avatar ?? null,
- };
- };
-}
diff --git a/apps/desktop/src/main/handlers/queries/document-get.ts b/apps/desktop/src/main/handlers/queries/document-get.ts
deleted file mode 100644
index 55f927af..00000000
--- a/apps/desktop/src/main/handlers/queries/document-get.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { sha256 } from 'js-sha256';
-import { isEqual } from 'lodash-es';
-import {
- DocumentGetQueryInput,
- DocumentGetQueryOutput,
-} from '@/operations/queries/document-get';
-import { databaseManager } from '@/main/data/database-manager';
-import { SelectNode } from '@/main/data/workspace/schema';
-import {
- MutationChange,
- ChangeCheckResult,
- QueryHandler,
- QueryResult,
-} from '@/main/types';
-import { NodeAttributes } from '@colanode/core';
-import { mapBlocksToContents } from '@/lib/editor';
-
-export class DocumentGetQueryHandler
- implements QueryHandler<DocumentGetQueryInput>
-{
- public async handleQuery(
- input: DocumentGetQueryInput
- ): Promise<QueryResult<DocumentGetQueryInput>> {
- const document = await this.fetchDocument(input);
- return {
- output: this.buildOutput(document),
- state: {
- document,
- },
- };
- }
-
- public async checkForChanges(
- changes: MutationChange[],
- input: DocumentGetQueryInput,
- state: Record<string, any>
- ): Promise<ChangeCheckResult<DocumentGetQueryInput>> {
- if (
- !changes.some(
- (change) =>
- change.type === 'workspace' &&
- change.table === 'nodes' &&
- change.userId === input.userId
- )
- ) {
- return {
- hasChanges: false,
- };
- }
-
- const document = await this.fetchDocument(input);
- if (isEqual(document, state.document)) {
- return {
- hasChanges: false,
- };
- }
-
- return {
- hasChanges: true,
- result: {
- output: this.buildOutput(document),
- state: {
- document,
- },
- },
- };
- }
-
- private async fetchDocument(
- input: DocumentGetQueryInput
- ): Promise<SelectNode | undefined> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
- return workspaceDatabase
- .selectFrom('nodes')
- .selectAll()
- .where('id', '=', input.documentId)
- .executeTakeFirst();
- }
-
- private buildOutput(
- document: SelectNode | null | undefined
- ): DocumentGetQueryOutput {
- if (!document) {
- return {
- content: null,
- hash: null,
- };
- }
-
- const attributes = JSON.parse(document.attributes) as NodeAttributes;
- if (attributes.type !== 'page' && attributes.type !== 'record') {
- return {
- content: null,
- hash: null,
- };
- }
-
- const nodeBlocks = Object.values(attributes.content ?? {});
- const contents = mapBlocksToContents(document.id, nodeBlocks);
-
- if (!contents.length) {
- contents.push({
- type: 'paragraph',
- });
- }
-
- const content = {
- type: 'doc',
- content: contents,
- };
-
- const hash = sha256(JSON.stringify(content));
-
- return {
- content,
- hash,
- };
- }
-}
diff --git a/apps/desktop/src/main/handlers/queries/index.ts b/apps/desktop/src/main/handlers/queries/index.ts
index abbc863d..119ae154 100644
--- a/apps/desktop/src/main/handlers/queries/index.ts
+++ b/apps/desktop/src/main/handlers/queries/index.ts
@@ -13,12 +13,11 @@ import { UserSearchQueryHandler } from '@/main/handlers/queries/user-search';
import { WorkspaceListQueryHandler } from '@/main/handlers/queries/workspace-list';
import { WorkspaceUserListQueryHandler } from '@/main/handlers/queries/workspace-user-list';
import { RecordListQueryHandler } from '@/main/handlers/queries/record-list';
-import { ChatGetQueryHandler } from '@/main/handlers/queries/chat-get';
import { FileListQueryHandler } from '@/main/handlers/queries/file-list';
import { FileGetQueryHandler } from '@/main/handlers/queries/file-get';
-import { DocumentGetQueryHandler } from '@/main/handlers/queries/document-get';
import { EmojisGetQueryHandler } from '@/main/handlers/queries/emojis-get';
import { IconsGetQueryHandler } from '@/main/handlers/queries/icons-get';
+import { NodeWithAncestorsGetQueryHandler } from '@/main/handlers/queries/node-with-ancestors-get';
type QueryHandlerMap = {
[K in keyof QueryMap]: QueryHandler<QueryMap[K]['input']>;
@@ -38,10 +37,9 @@ export const queryHandlerMap: QueryHandlerMap = {
user_search: new UserSearchQueryHandler(),
workspace_list: new WorkspaceListQueryHandler(),
workspace_user_list: new WorkspaceUserListQueryHandler(),
- chat_get: new ChatGetQueryHandler(),
file_list: new FileListQueryHandler(),
file_get: new FileGetQueryHandler(),
- document_get: new DocumentGetQueryHandler(),
emojis_get: new EmojisGetQueryHandler(),
icons_get: new IconsGetQueryHandler(),
+ node_with_ancestors_get: new NodeWithAncestorsGetQueryHandler(),
};
diff --git a/apps/desktop/src/main/handlers/queries/node-with-ancestors-get.ts b/apps/desktop/src/main/handlers/queries/node-with-ancestors-get.ts
new file mode 100644
index 00000000..97299a6e
--- /dev/null
+++ b/apps/desktop/src/main/handlers/queries/node-with-ancestors-get.ts
@@ -0,0 +1,96 @@
+import { databaseManager } from '@/main/data/database-manager';
+import { mapNode } from '@/main/utils';
+import { SelectNode } from '@/main/data/workspace/schema';
+import {
+ MutationChange,
+ ChangeCheckResult,
+ QueryHandler,
+ QueryResult,
+} from '@/main/types';
+import { isEqual } from 'lodash-es';
+import { NodeWithAncestorsGetQueryInput } from '@/operations/queries/node-with-ancestors-get';
+import { fetchNodeAncestors } from '@/main/utils';
+
+export class NodeWithAncestorsGetQueryHandler
+ implements QueryHandler<NodeWithAncestorsGetQueryInput>
+{
+ public async handleQuery(
+ input: NodeWithAncestorsGetQueryInput
+ ): Promise<QueryResult<NodeWithAncestorsGetQueryInput>> {
+ const rows = await this.fetchNodes(input);
+
+ return {
+ output: rows.map(mapNode),
+ state: {
+ rows,
+ },
+ };
+ }
+
+ public async checkForChanges(
+ changes: MutationChange[],
+ input: NodeWithAncestorsGetQueryInput,
+ state: Record<string, any>
+ ): Promise<ChangeCheckResult<NodeWithAncestorsGetQueryInput>> {
+ if (
+ !changes.some(
+ (change) =>
+ change.type === 'workspace' &&
+ change.table === 'nodes' &&
+ change.userId === input.userId
+ )
+ ) {
+ return {
+ hasChanges: false,
+ };
+ }
+
+ const rows = await this.fetchNodes(input);
+ if (isEqual(rows, state.rows)) {
+ return {
+ hasChanges: false,
+ };
+ }
+
+ return {
+ hasChanges: true,
+ result: {
+ output: rows.map(mapNode),
+ state: {
+ rows,
+ },
+ },
+ };
+ }
+
+ private async fetchNodes(
+ input: NodeWithAncestorsGetQueryInput
+ ): Promise<SelectNode[]> {
+ const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ input.userId
+ );
+
+ const rows = await fetchNodeAncestors(workspaceDatabase, input.nodeId);
+ if (rows.length === 0) {
+ return [];
+ }
+
+ const result: SelectNode[] = [];
+
+ let node = rows.find((row) => row.id === input.nodeId);
+ if (!node) {
+ return [];
+ }
+
+ while (node) {
+ result.push(node);
+ node = rows.find((row) => row.id === node?.parent_id);
+
+ if (!node || node.id === node.parent_id) {
+ break;
+ }
+ }
+
+ return result.reverse();
+ }
+}
diff --git a/apps/desktop/src/main/node-manager.ts b/apps/desktop/src/main/node-manager.ts
index 8c6e4038..155e8f10 100644
--- a/apps/desktop/src/main/node-manager.ts
+++ b/apps/desktop/src/main/node-manager.ts
@@ -12,14 +12,8 @@ import {
} from '@/types/sync';
import { generateId, IdType } from '@colanode/core';
import { databaseManager } from '@/main/data/database-manager';
-import { hasUpdateChanges, mapNode } from '@/main/utils';
-import { Kysely, Transaction } from 'kysely';
-import {
- CreateDownload,
- CreateUpload,
- SelectNode,
- WorkspaceDatabaseSchema,
-} from '@/main/data/workspace/schema';
+import { fetchNodeAncestors, hasUpdateChanges, mapNode } from '@/main/utils';
+import { CreateDownload, CreateUpload } from '@/main/data/workspace/schema';
export type CreateNodeInput = {
id: string;
@@ -54,7 +48,7 @@ class NodeManager {
let ancestors: Node[] = [];
if (input.attributes.parentId) {
- const ancestorRows = await this.fetchNodeAncestors(
+ const ancestorRows = await fetchNodeAncestors(
transaction,
input.attributes.parentId
);
@@ -160,10 +154,7 @@ class NodeManager {
const workspaceDatabase =
await databaseManager.getWorkspaceDatabase(userId);
- const ancestorRows = await this.fetchNodeAncestors(
- workspaceDatabase,
- nodeId
- );
+ const ancestorRows = await fetchNodeAncestors(workspaceDatabase, nodeId);
const nodeRow = ancestorRows.find((ancestor) => ancestor.id === nodeId);
if (!nodeRow) {
throw new Error('Node not found');
@@ -263,10 +254,7 @@ class NodeManager {
const workspaceDatabase =
await databaseManager.getWorkspaceDatabase(userId);
- const ancestorRows = await this.fetchNodeAncestors(
- workspaceDatabase,
- nodeId
- );
+ const ancestorRows = await fetchNodeAncestors(workspaceDatabase, nodeId);
const ancestors = ancestorRows.map(mapNode);
const node = ancestors.find((ancestor) => ancestor.id === nodeId);
@@ -313,26 +301,6 @@ class NodeManager {
.execute();
});
}
-
- private async fetchNodeAncestors(
- database:
- | Kysely<WorkspaceDatabaseSchema>
- | Transaction<WorkspaceDatabaseSchema>,
- nodeId: string
- ): Promise<SelectNode[]> {
- return database
- .selectFrom('nodes')
- .selectAll()
- .where(
- 'id',
- 'in',
- database
- .selectFrom('node_paths')
- .select('ancestor_id')
- .where('descendant_id', '=', nodeId)
- )
- .execute();
- }
}
export const nodeManager = new NodeManager();
diff --git a/apps/desktop/src/main/utils.ts b/apps/desktop/src/main/utils.ts
index f2263421..f4a004ec 100644
--- a/apps/desktop/src/main/utils.ts
+++ b/apps/desktop/src/main/utils.ts
@@ -1,8 +1,17 @@
import { app } from 'electron';
-import { DeleteResult, InsertResult, UpdateResult } from 'kysely';
+import {
+ DeleteResult,
+ InsertResult,
+ Kysely,
+ Transaction,
+ UpdateResult,
+} from 'kysely';
import path from 'path';
-import { SelectNode } from '@/main/data/workspace/schema';
-import { Node } from '@colanode/core';
+import {
+ SelectNode,
+ WorkspaceDatabaseSchema,
+} from '@/main/data/workspace/schema';
+import { Node, NodeTypes } from '@colanode/core';
export const appPath = app.getPath('userData');
@@ -42,6 +51,27 @@ export const hasDeleteChanges = (result: DeleteResult[]): boolean => {
return result.some((r) => r.numDeletedRows && r.numDeletedRows > 0n);
};
+export const fetchNodeAncestors = (
+ database:
+ | Kysely<WorkspaceDatabaseSchema>
+ | Transaction<WorkspaceDatabaseSchema>,
+ nodeId: string
+): Promise<SelectNode[]> => {
+ return database
+ .selectFrom('nodes')
+ .selectAll()
+ .where(
+ 'id',
+ 'in',
+ database
+ .selectFrom('node_paths')
+ .select('ancestor_id')
+ .where('descendant_id', '=', nodeId)
+ )
+ .where('type', '!=', NodeTypes.Workspace)
+ .execute();
+};
+
export const mapNode = (row: SelectNode): Node => {
return {
id: row.id,
diff --git a/apps/desktop/src/operations/queries/chat-get.ts b/apps/desktop/src/operations/queries/chat-get.ts
deleted file mode 100644
index 957dd6de..00000000
--- a/apps/desktop/src/operations/queries/chat-get.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ChatNode } from '@/types/chats';
-
-export type ChatGetQueryInput = {
- type: 'chat_get';
- chatId: string;
- userId: string;
-};
-
-declare module '@/operations/queries' {
- interface QueryMap {
- chat_get: {
- input: ChatGetQueryInput;
- output: ChatNode | null;
- };
- }
-}
diff --git a/apps/desktop/src/operations/queries/document-get.ts b/apps/desktop/src/operations/queries/document-get.ts
deleted file mode 100644
index 922ab808..00000000
--- a/apps/desktop/src/operations/queries/document-get.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { JSONContent } from '@tiptap/core';
-
-export type DocumentGetQueryInput = {
- type: 'document_get';
- documentId: string;
- userId: string;
-};
-
-export type DocumentGetQueryOutput = {
- content: JSONContent | null;
- hash: string | null;
-};
-
-declare module '@/operations/queries' {
- interface QueryMap {
- document_get: {
- input: DocumentGetQueryInput;
- output: DocumentGetQueryOutput;
- };
- }
-}
diff --git a/apps/desktop/src/operations/queries/node-with-ancestors-get.ts b/apps/desktop/src/operations/queries/node-with-ancestors-get.ts
new file mode 100644
index 00000000..263ae5e4
--- /dev/null
+++ b/apps/desktop/src/operations/queries/node-with-ancestors-get.ts
@@ -0,0 +1,16 @@
+import { Node } from '@colanode/core';
+
+export type NodeWithAncestorsGetQueryInput = {
+ type: 'node_with_ancestors_get';
+ nodeId: string;
+ userId: string;
+};
+
+declare module '@/operations/queries' {
+ interface QueryMap {
+ node_with_ancestors_get: {
+ input: NodeWithAncestorsGetQueryInput;
+ output: Node[];
+ };
+ }
+}
diff --git a/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx
new file mode 100644
index 00000000..e1645e86
--- /dev/null
+++ b/apps/desktop/src/renderer/components/channels/channel-breadcrumb-item.tsx
@@ -0,0 +1,20 @@
+import { ChannelNode } from '@colanode/core';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+
+interface ChannelBreadcrumbItemProps {
+ node: ChannelNode;
+}
+
+export const ChannelBreadcrumbItem = ({ node }: ChannelBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={node.id}
+ name={node.attributes.name}
+ avatar={node.attributes.avatar}
+ />
+ <span>{node.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 5f6f68d5..965e772e 100644
--- a/apps/desktop/src/renderer/components/channels/channel-container.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-container.tsx
@@ -1,9 +1,37 @@
import { Conversation } from '@/renderer/components/messages/conversation';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { ChannelHeader } from '@/renderer/components/channels/channel-header';
+import { extractNodeRole } from '@colanode/core';
interface ChannelContainerProps {
nodeId: string;
}
export const ChannelContainer = ({ nodeId }: ChannelContainerProps) => {
- return <Conversation conversationId={nodeId} />;
+ const workspace = useWorkspace();
+ const { data, isPending } = useQuery({
+ type: 'node_with_ancestors_get',
+ nodeId,
+ userId: workspace.userId,
+ });
+
+ if (isPending) {
+ return null;
+ }
+
+ const nodes = data ?? [];
+ const channel = nodes.find((node) => node.id === nodeId);
+ const role = extractNodeRole(nodes, workspace.userId);
+
+ if (!channel || channel.type !== 'channel' || !role) {
+ return null;
+ }
+
+ return (
+ <div className="flex h-full w-full flex-col">
+ <ChannelHeader nodes={nodes} channel={channel} role={role} />
+ <Conversation conversationId={nodeId} />
+ </div>
+ );
};
diff --git a/apps/desktop/src/renderer/components/channels/channel-header.tsx b/apps/desktop/src/renderer/components/channels/channel-header.tsx
new file mode 100644
index 00000000..9fa356ce
--- /dev/null
+++ b/apps/desktop/src/renderer/components/channels/channel-header.tsx
@@ -0,0 +1,25 @@
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
+import { ChannelNode, Node, NodeRole } from '@colanode/core';
+import { Header } from '@/renderer/components/ui/header';
+import { ContainerBreadcrumb } from '@/renderer/components/workspaces/containers/container-breadcrumb';
+import { ChannelSettings } from './channel-settings';
+
+interface ChannelHeaderProps {
+ nodes: Node[];
+ channel: ChannelNode;
+ role: NodeRole;
+}
+
+export const ChannelHeader = ({ nodes, channel }: ChannelHeaderProps) => {
+ return (
+ <Header>
+ <div className="flex w-full items-center gap-2 px-4">
+ <ContainerBreadcrumb nodes={nodes} />
+ <div className="flex items-center gap-2">
+ <NodeCollaboratorsPopover nodeId={channel.id} nodes={nodes} />
+ <ChannelSettings nodeId={channel.id} />
+ </div>
+ </div>
+ </Header>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx
new file mode 100644
index 00000000..b529b848
--- /dev/null
+++ b/apps/desktop/src/renderer/components/chats/chat-breadcrumb-item.tsx
@@ -0,0 +1,38 @@
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { ChatNode } from '@colanode/core';
+
+interface ChatBreadcrumbItemProps {
+ node: ChatNode;
+}
+
+export const ChatBreadcrumbItem = ({ node }: ChatBreadcrumbItemProps) => {
+ const workspace = useWorkspace();
+ const collaboratorId =
+ Object.keys(node.attributes.collaborators).find(
+ (id) => id !== workspace.userId
+ ) ?? '';
+
+ const { data, isPending } = useQuery({
+ type: 'node_get',
+ nodeId: collaboratorId,
+ userId: workspace.userId,
+ });
+
+ if (isPending || !data || data.type !== 'user') {
+ return null;
+ }
+
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={data.id}
+ name={data.attributes.name}
+ avatar={data.attributes.avatar}
+ />
+ <span>{data.attributes.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 e7163794..a9d452c1 100644
--- a/apps/desktop/src/renderer/components/chats/chat-container.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-container.tsx
@@ -1,9 +1,34 @@
import { Conversation } from '@/renderer/components/messages/conversation';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { ChatHeader } from '@/renderer/components/chats/chat-header';
interface ChatContainerProps {
nodeId: string;
}
export const ChatContainer = ({ nodeId }: ChatContainerProps) => {
- return <Conversation conversationId={nodeId} />;
+ const workspace = useWorkspace();
+
+ const { data, isPending } = useQuery({
+ type: 'node_get',
+ nodeId,
+ userId: workspace.userId,
+ });
+
+ if (isPending) {
+ return null;
+ }
+
+ const node = data;
+ if (!node || node.type !== 'chat') {
+ return null;
+ }
+
+ return (
+ <div className="flex h-full w-full flex-col">
+ <ChatHeader chat={node} />
+ <Conversation conversationId={nodeId} />
+ </div>
+ );
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-header.tsx b/apps/desktop/src/renderer/components/chats/chat-header.tsx
new file mode 100644
index 00000000..d6cceaea
--- /dev/null
+++ b/apps/desktop/src/renderer/components/chats/chat-header.tsx
@@ -0,0 +1,21 @@
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
+import { ChatNode } from '@colanode/core';
+import { Header } from '@/renderer/components/ui/header';
+import { ContainerBreadcrumb } from '@/renderer/components/workspaces/containers/container-breadcrumb';
+
+interface ChatHeaderProps {
+ chat: ChatNode;
+}
+
+export const ChatHeader = ({ chat }: ChatHeaderProps) => {
+ return (
+ <Header>
+ <div className="flex w-full items-center gap-2 px-4">
+ <ContainerBreadcrumb nodes={[chat]} />
+ <div className="flex items-center gap-2">
+ <NodeCollaboratorsPopover nodeId={chat.id} nodes={[chat]} />
+ </div>
+ </div>
+ </Header>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
index dbe0440b..13f23978 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
@@ -1,48 +1,63 @@
-import { NodeCollaborator as NodeCollaboratorType } from '@/types/nodes';
import { Avatar } from '@/renderer/components/avatars/avatar';
import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { Trash2 } from 'lucide-react';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { NodeRole } from '@colanode/core';
interface NodeCollaboratorProps {
nodeId: string;
- collaborator: NodeCollaboratorType;
+ collaboratorId: string;
+ role: NodeRole;
removable?: boolean;
}
export const NodeCollaborator = ({
nodeId,
- collaborator,
+ collaboratorId,
+ role,
removable,
}: NodeCollaboratorProps) => {
const workspace = useWorkspace();
const { mutate } = useMutation();
+ const { data } = useQuery({
+ type: 'node_get',
+ nodeId: collaboratorId,
+ userId: workspace.userId,
+ });
+
+ if (!data || data.type !== 'user') {
+ return null;
+ }
+
return (
<div className="flex items-center justify-between space-x-3">
<div className="flex items-center space-x-3">
<Avatar
- id={collaborator.id}
- name={collaborator.name}
- avatar={collaborator.avatar}
+ id={data.id}
+ name={data.attributes.name}
+ avatar={data.attributes.avatar}
/>
<div className="flex-grow">
<p className="text-sm font-medium leading-none">
- {collaborator.name}
+ {data.attributes.name}
+ </p>
+ <p className="text-sm text-muted-foreground">
+ {data.attributes.email}
</p>
- <p className="text-sm text-muted-foreground">{collaborator.email}</p>
</div>
</div>
<div className="flex flex-row items-center gap-1">
<NodeCollaboratorRoleDropdown
- value={collaborator.role}
+ value={role}
onChange={(newRole) => {
mutate({
input: {
type: 'node_collaborator_update',
nodeId: nodeId,
- collaboratorId: collaborator.id,
+ collaboratorId: collaboratorId,
role: newRole,
userId: workspace.userId,
},
@@ -57,7 +72,7 @@ export const NodeCollaborator = ({
input: {
type: 'node_collaborator_delete',
nodeId: nodeId,
- collaboratorId: collaborator.id,
+ collaboratorId: collaboratorId,
userId: workspace.userId,
},
});
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
index d60519d2..677e0942 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
@@ -5,13 +5,15 @@ import {
} from '@/renderer/components/ui/popover';
import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';
import { UserRoundPlus } from 'lucide-react';
-
+import { Node } from '@colanode/core';
interface NodeCollaboratorsPopoverProps {
nodeId: string;
+ nodes: Node[];
}
export const NodeCollaboratorsPopover = ({
nodeId,
+ nodes,
}: NodeCollaboratorsPopoverProps) => {
return (
<Popover>
@@ -19,7 +21,7 @@ export const NodeCollaboratorsPopover = ({
<UserRoundPlus className="size-5 cursor-pointer text-muted-foreground hover:text-foreground" />
</PopoverTrigger>
<PopoverContent className="mr-2 max-h-128 w-128 overflow-auto">
- <NodeCollaborators nodeId={nodeId} />
+ <NodeCollaborators nodeId={nodeId} nodes={nodes} />
</PopoverContent>
</Popover>
);
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
index d85d8003..42b20202 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
@@ -2,44 +2,46 @@ import React from 'react';
import { Separator } from '@/renderer/components/ui/separator';
import { NodeCollaborator } from '@/renderer/components/collaborators/node-collaborator';
import { NodeCollaboratorCreate } from '@/renderer/components/collaborators/node-collaborator-create';
-import { useQuery } from '@/renderer/hooks/use-query';
-import { useWorkspace } from '@/renderer/contexts/workspace';
+import { extractNodeName, Node } from '@colanode/core';
+import { buildNodeCollaborators } from '@/lib/nodes';
interface NodeCollaboratorsProps {
nodeId: string;
+ nodes: Node[];
}
-export const NodeCollaborators = ({ nodeId }: NodeCollaboratorsProps) => {
- const workspace = useWorkspace();
- const { data, isPending } = useQuery({
- type: 'node_collaborator_list',
- nodeId,
- userId: workspace.userId,
- });
+export const NodeCollaborators = ({
+ nodeId,
+ nodes,
+}: NodeCollaboratorsProps) => {
+ const collaborators = buildNodeCollaborators(nodes);
+ const directCollaborators = collaborators.filter(
+ (collaborator) => collaborator.nodeId === nodeId
+ );
+ const directCollaboratorIds = directCollaborators.map(
+ (collaborator) => collaborator.collaboratorId
+ );
- if (isPending || !data) {
- return null;
- }
+ const ancestors = nodes.reverse().filter((node) => node.id !== nodeId);
return (
<div className="flex flex-col gap-2">
<NodeCollaboratorCreate
nodeId={nodeId}
- existingCollaborators={data.direct.map(
- (collaborator) => collaborator.id
- )}
+ existingCollaborators={directCollaboratorIds}
/>
<Separator />
<div className="space-y-3">
<h4 className="text-sm font-medium">Direct access</h4>
<div className="flex flex-col gap-3">
- {data.direct && data.direct.length > 0 ? (
+ {directCollaborators.length > 0 ? (
<React.Fragment>
- {data.direct.map((collaborator) => (
+ {directCollaborators.map((collaborator) => (
<NodeCollaborator
- key={collaborator.id}
+ key={collaborator.collaboratorId}
nodeId={nodeId}
- collaborator={collaborator}
+ collaboratorId={collaborator.collaboratorId}
+ role={collaborator.role}
removable={true}
/>
))}
@@ -51,25 +53,36 @@ export const NodeCollaborators = ({ nodeId }: NodeCollaboratorsProps) => {
)}
</div>
</div>
- {data.inherit?.map((inheritGroup) => (
- <div key={inheritGroup.id}>
- <Separator className="my-3" />
- <div className="space-y-3">
- <h4 className="text-sm font-medium">
- Inherit from {inheritGroup.name}
- </h4>
- <div className="flex flex-col gap-3">
- {inheritGroup.collaborators?.map((collaborator) => (
- <NodeCollaborator
- key={collaborator.id}
- nodeId={nodeId}
- collaborator={collaborator}
- />
- ))}
+ {ancestors.map((node) => {
+ const inheritCollaborators = collaborators.filter(
+ (collaborator) => collaborator.nodeId === node.id
+ );
+
+ if (inheritCollaborators.length === 0) {
+ return null;
+ }
+
+ const name = extractNodeName(node.attributes) ?? 'Unknown';
+ return (
+ <div key={node.id}>
+ <Separator className="my-3" />
+ <div className="space-y-3">
+ <h4 className="text-sm font-medium">Inherit from {name}</h4>
+ <div className="flex flex-col gap-3">
+ {inheritCollaborators.map((collaborator) => (
+ <NodeCollaborator
+ key={collaborator.collaboratorId}
+ nodeId={nodeId}
+ collaboratorId={collaborator.collaboratorId}
+ role={collaborator.role}
+ removable={false}
+ />
+ ))}
+ </div>
</div>
</div>
- </div>
- ))}
+ );
+ })}
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx
new file mode 100644
index 00000000..393d1ee6
--- /dev/null
+++ b/apps/desktop/src/renderer/components/databases/database-breadcrumb-item.tsx
@@ -0,0 +1,22 @@
+import { DatabaseNode } from '@colanode/core';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+
+interface DatabaseBreadcrumbItemProps {
+ node: DatabaseNode;
+}
+
+export const DatabaseBreadcrumbItem = ({
+ node,
+}: DatabaseBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={node.id}
+ name={node.attributes.name}
+ avatar={node.attributes.avatar}
+ />
+ <span>{node.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 d71ebfcb..7796e273 100644
--- a/apps/desktop/src/renderer/components/databases/database-container.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-container.tsx
@@ -1,14 +1,40 @@
import { Database } from '@/renderer/components/databases/database';
import { DatabaseViews } from '@/renderer/components/databases/database-views';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { DatabaseHeader } from '@/renderer/components/databases/database-header';
+import { extractNodeRole } from '@colanode/core';
interface DatabaseContainerProps {
nodeId: string;
}
export const DatabaseContainer = ({ nodeId }: DatabaseContainerProps) => {
+ const workspace = useWorkspace();
+ const { data, isPending } = useQuery({
+ type: 'node_with_ancestors_get',
+ nodeId,
+ userId: workspace.userId,
+ });
+
+ if (isPending) {
+ return null;
+ }
+
+ const nodes = data ?? [];
+ const database = nodes.find((node) => node.id === nodeId);
+ const role = extractNodeRole(nodes, workspace.userId);
+
+ if (!database || database.type !== 'database' || !role) {
+ return null;
+ }
+
return (
<Database databaseId={nodeId}>
- <DatabaseViews />
+ <div className="flex h-full w-full flex-col">
+ <DatabaseHeader nodes={nodes} database={database} role={role} />
+ <DatabaseViews />
+ </div>
</Database>
);
};
diff --git a/apps/desktop/src/renderer/components/databases/database-header.tsx b/apps/desktop/src/renderer/components/databases/database-header.tsx
new file mode 100644
index 00000000..b0ea808b
--- /dev/null
+++ b/apps/desktop/src/renderer/components/databases/database-header.tsx
@@ -0,0 +1,25 @@
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
+import { DatabaseNode, Node, NodeRole } from '@colanode/core';
+import { Header } from '@/renderer/components/ui/header';
+import { ContainerBreadcrumb } from '@/renderer/components/workspaces/containers/container-breadcrumb';
+import { DatabaseSettings } from '@/renderer/components/databases/database-settings';
+
+interface DatabaseHeaderProps {
+ nodes: Node[];
+ database: DatabaseNode;
+ role: NodeRole;
+}
+
+export const DatabaseHeader = ({ nodes, database }: DatabaseHeaderProps) => {
+ return (
+ <Header>
+ <div className="flex w-full items-center gap-2 px-4">
+ <ContainerBreadcrumb nodes={nodes} />
+ <div className="flex items-center gap-2">
+ <NodeCollaboratorsPopover nodeId={database.id} nodes={nodes} />
+ <DatabaseSettings nodeId={database.id} />
+ </div>
+ </div>
+ </Header>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/documents/document-editor.tsx b/apps/desktop/src/renderer/components/documents/document-editor.tsx
index 769c4813..f7b00437 100644
--- a/apps/desktop/src/renderer/components/documents/document-editor.tsx
+++ b/apps/desktop/src/renderer/components/documents/document-editor.tsx
@@ -59,19 +59,19 @@ import { useMutation } from '@/renderer/hooks/use-mutation';
interface DocumentEditorProps {
documentId: string;
content: JSONContent;
- hash: string;
+ versionId: string;
}
export const DocumentEditor = ({
documentId,
content,
- hash,
+ versionId,
}: DocumentEditorProps) => {
const workspace = useWorkspace();
const { mutate } = useMutation();
const hasPendingChanges = React.useRef(false);
- const hashRef = React.useRef(hash);
+ const versionIdRef = React.useRef(versionId);
const debouncedSave = React.useMemo(
() =>
debounce((content: JSONContent) => {
@@ -176,7 +176,7 @@ export const DocumentEditor = ({
return;
}
- if (hashRef.current === hash) {
+ if (versionIdRef.current === versionId) {
return;
}
@@ -187,8 +187,8 @@ export const DocumentEditor = ({
editor.chain().setContent(content).run();
}
- hashRef.current = hash;
- }, [content, hash]);
+ versionIdRef.current = versionId;
+ }, [content, versionId]);
return (
<div className="min-h-[500px]">
diff --git a/apps/desktop/src/renderer/components/documents/document.tsx b/apps/desktop/src/renderer/components/documents/document.tsx
index 34765912..f285994c 100644
--- a/apps/desktop/src/renderer/components/documents/document.tsx
+++ b/apps/desktop/src/renderer/components/documents/document.tsx
@@ -1,29 +1,34 @@
+import { Block } from '@colanode/core';
import { DocumentEditor } from '@/renderer/components/documents/document-editor';
-import { useQuery } from '@/renderer/hooks/use-query';
-import { useWorkspace } from '@/renderer/contexts/workspace';
+import { mapBlocksToContents } from '@/lib/editor';
interface DocumentProps {
nodeId: string;
+ content?: Record<string, Block> | null;
+ versionId: string;
}
-export const Document = ({ nodeId }: DocumentProps) => {
- const workspace = useWorkspace();
- const { data, isPending } = useQuery({
- type: 'document_get',
- documentId: nodeId,
- userId: workspace.userId,
- });
+export const Document = ({ nodeId, content, versionId }: DocumentProps) => {
+ const nodeBlocks = Object.values(content ?? {});
+ const contents = mapBlocksToContents(nodeId, nodeBlocks);
- if (isPending || !data || !data.hash || data.content === null) {
- return null;
+ if (!contents.length) {
+ contents.push({
+ type: 'paragraph',
+ });
}
+ const tiptapContent = {
+ type: 'doc',
+ content: contents,
+ };
+
return (
<DocumentEditor
key={nodeId}
documentId={nodeId}
- content={data.content}
- hash={data.hash}
+ content={tiptapContent}
+ versionId={versionId}
/>
);
};
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..9f856598
--- /dev/null
+++ b/apps/desktop/src/renderer/components/files/file-breadcrumb-item.tsx
@@ -0,0 +1,15 @@
+import { FileNode } from '@colanode/core';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+
+interface FileBreadcrumbItemProps {
+ node: FileNode;
+}
+
+export const FileBreadcrumbItem = ({ node }: FileBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar size="small" id={node.id} name={node.attributes.name} />
+ <span>{node.attributes.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 828a145f..b9974a9b 100644
--- a/apps/desktop/src/renderer/components/files/file-container.tsx
+++ b/apps/desktop/src/renderer/components/files/file-container.tsx
@@ -6,6 +6,8 @@ import { Button } from '@/renderer/components/ui/button';
import { SquareArrowOutUpRight } from 'lucide-react';
import { FileDownload } from '@/renderer/components/files/file-download';
import { getFileUrl } from '@/lib/files';
+import { FileHeader } from './file-header';
+import { extractNodeRole } from '@colanode/core';
interface FileContainerProps {
nodeId: string;
@@ -13,49 +15,62 @@ interface FileContainerProps {
export const FileContainer = ({ nodeId }: FileContainerProps) => {
const workspace = useWorkspace();
- const { data } = useQuery({
- type: 'file_get',
+ const { data, isPending } = useQuery({
+ type: 'node_with_ancestors_get',
+ nodeId,
userId: workspace.userId,
- fileId: nodeId,
});
- if (!data) {
+ if (isPending) {
return null;
}
- const url = getFileUrl(workspace.userId, data.id, data.extension);
+ const nodes = data ?? [];
+ const file = nodes.find((node) => node.id === nodeId);
+ const role = extractNodeRole(nodes, workspace.userId);
+ const downloadProgress = 100;
+
+ if (!file || file.type !== 'file' || !role) {
+ return null;
+ }
+
+ const url = getFileUrl(workspace.userId, file.id, file.attributes.extension);
return (
- <div className="flex h-full max-h-full w-full flex-row items-center gap-2">
- <div className="flex h-full max-h-full w-full max-w-full flex-grow flex-col items-center justify-center overflow-hidden">
- <div className="mr-2 flex w-full flex-row justify-end gap-2">
- <Button
- variant="outline"
- size="sm"
- onClick={() =>
- window.colanode.openFile(
- workspace.userId,
- data.id,
- data.extension
- )
- }
- >
- <SquareArrowOutUpRight className="mr-1 size-4" /> Open
- </Button>
+ <div className="flex h-full w-full flex-col">
+ <FileHeader nodes={nodes} file={file} role={role} />
+ <div className="flex h-full max-h-full w-full flex-row items-center gap-2">
+ <div className="flex h-full max-h-full w-full max-w-full flex-grow flex-col items-center justify-center overflow-hidden">
+ <div className="mr-2 flex w-full flex-row justify-end gap-2">
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() =>
+ window.colanode.openFile(
+ workspace.userId,
+ file.id,
+ file.attributes.extension
+ )
+ }
+ >
+ <SquareArrowOutUpRight className="mr-1 size-4" /> Open
+ </Button>
+ </div>
+ <div className="flex w-full max-w-full flex-grow items-center justify-center overflow-hidden">
+ {downloadProgress !== 100 ? (
+ <FileDownload id={file.id} downloadProgress={downloadProgress} />
+ ) : (
+ <FilePreview
+ url={url}
+ name={file.attributes.name}
+ mimeType={file.attributes.mimeType}
+ />
+ )}
+ </div>
</div>
- <div className="flex w-full max-w-full flex-grow items-center justify-center overflow-hidden">
- {data.downloadProgress !== 100 ? (
- <FileDownload
- id={data.id}
- downloadProgress={data.downloadProgress}
- />
- ) : (
- <FilePreview url={url} name={data.name} mimeType={data.mimeType} />
- )}
+ <div className="h-full w-72 min-w-72 overflow-hidden border-l border-gray-100 p-2 pl-3">
+ <FileSidebar file={file} downloadProgress={downloadProgress} />
</div>
</div>
- <div className="h-full w-72 min-w-72 overflow-hidden border-l border-gray-100 p-2 pl-3">
- <FileSidebar file={data} />
- </div>
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/files/file-header.tsx b/apps/desktop/src/renderer/components/files/file-header.tsx
new file mode 100644
index 00000000..cf76fbe0
--- /dev/null
+++ b/apps/desktop/src/renderer/components/files/file-header.tsx
@@ -0,0 +1,25 @@
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
+import { FileNode, Node, NodeRole } from '@colanode/core';
+import { Header } from '@/renderer/components/ui/header';
+import { ContainerBreadcrumb } from '@/renderer/components/workspaces/containers/container-breadcrumb';
+import { FileSettings } from '@/renderer/components/files/file-settings';
+
+interface FileHeaderProps {
+ nodes: Node[];
+ file: FileNode;
+ role: NodeRole;
+}
+
+export const FileHeader = ({ nodes, file }: FileHeaderProps) => {
+ return (
+ <Header>
+ <div className="flex w-full items-center gap-2 px-4">
+ <ContainerBreadcrumb nodes={nodes} />
+ <div className="flex items-center gap-2">
+ <NodeCollaboratorsPopover nodeId={file.id} nodes={nodes} />
+ <FileSettings nodeId={file.id} />
+ </div>
+ </div>
+ </Header>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/files/file-sidebar.tsx b/apps/desktop/src/renderer/components/files/file-sidebar.tsx
index 81a4d0eb..d8839118 100644
--- a/apps/desktop/src/renderer/components/files/file-sidebar.tsx
+++ b/apps/desktop/src/renderer/components/files/file-sidebar.tsx
@@ -1,12 +1,15 @@
import React from 'react';
-import { FileDetails } from '@/types/files';
import { formatBytes } from '@/lib/files';
import { formatDate } from '@/lib/utils';
import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';
import { Avatar } from '@/renderer/components/avatars/avatar';
+import { FileNode } from '@colanode/core';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
interface FileSidebarProps {
- file: FileDetails;
+ file: FileNode;
+ downloadProgress: number;
}
const FileMeta = ({ title, value }: { title: string; value: string }) => {
@@ -18,43 +21,52 @@ const FileMeta = ({ title, value }: { title: string; value: string }) => {
);
};
-export const FileSidebar = ({ file }: FileSidebarProps) => {
+export const FileSidebar = ({ file, downloadProgress }: FileSidebarProps) => {
+ const workspace = useWorkspace();
+ const { data } = useQuery({
+ type: 'node_get',
+ nodeId: file.createdBy,
+ userId: workspace.userId,
+ });
+
+ const user = data?.type === 'user' ? data : null;
+
return (
<React.Fragment>
<div className="flex items-center gap-x-4 p-2">
<FileThumbnail
id={file.id}
- name={file.name}
- mimeType={file.mimeType}
- extension={file.extension}
- downloadProgress={file.downloadProgress}
+ name={file.attributes.name}
+ mimeType={file.attributes.mimeType}
+ extension={file.attributes.extension}
+ downloadProgress={downloadProgress}
className="h-12 w-9 min-w-[36px] overflow-hidden rounded object-contain"
/>
<div
className="line-clamp-3 break-words text-base font-medium"
- title={file.name || file.fileName}
+ title={file.attributes.name}
>
- {file.name}
+ {file.attributes.name}
</div>
</div>
<div className="mt-5 flex flex-col gap-4">
- <FileMeta title="Name" value={file.name} />
- <FileMeta title="Type" value={file.mimeType} />
- <FileMeta title="Size" value={formatBytes(file.size)} />
+ <FileMeta title="Name" value={file.attributes.name} />
+ <FileMeta title="Type" value={file.attributes.mimeType} />
+ <FileMeta title="Size" value={formatBytes(file.attributes.size)} />
<FileMeta title="Created at" value={formatDate(file.createdAt)} />
- {file.createdBy && (
+ {user && (
<div>
<p className="text-xs text-muted-foreground">Created by</p>
<div className="mt-1 flex flex-row items-center gap-2">
<Avatar
- id={file.createdBy.id}
- name={file.createdBy.name}
- avatar={file.createdBy.avatar}
+ id={user.id}
+ name={user.attributes.name}
+ avatar={user.attributes.avatar}
className="h-8 w-8"
/>
- <p className="text-foreground/80">{file.createdBy.name}</p>
+ <p className="text-foreground/80">{user.attributes.name}</p>
</div>
</div>
)}
diff --git a/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx
new file mode 100644
index 00000000..40de356b
--- /dev/null
+++ b/apps/desktop/src/renderer/components/folders/folder-breadcrumb-item.tsx
@@ -0,0 +1,20 @@
+import { FolderNode } from '@colanode/core';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+
+interface FolderBreadcrumbItemProps {
+ node: FolderNode;
+}
+
+export const FolderBreadcrumbItem = ({ node }: FolderBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={node.id}
+ name={node.attributes.name}
+ avatar={node.attributes.avatar}
+ />
+ <span>{node.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 045da755..a0bf2622 100644
--- a/apps/desktop/src/renderer/components/folders/folder-container.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-container.tsx
@@ -22,6 +22,9 @@ import {
List,
Upload,
} from 'lucide-react';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { extractNodeRole } from '@colanode/core';
+import { FolderHeader } from '@/renderer/components/folders/folder-header';
export type FolderLayout = {
value: FolderLayoutType;
@@ -59,12 +62,30 @@ export const FolderContainer = ({ nodeId }: FolderContainerProps) => {
const workspace = useWorkspace();
const { mutate } = useMutation();
+ const { data, isPending } = useQuery({
+ type: 'node_with_ancestors_get',
+ nodeId,
+ userId: workspace.userId,
+ });
+
const [layout, setLayout] = React.useState<FolderLayoutType>('grid');
+ const isDialogOpenedRef = React.useRef(false);
+
+ if (isPending) {
+ return null;
+ }
+
+ const nodes = data ?? [];
+ const folder = nodes.find((node) => node.id === nodeId);
+ const role = extractNodeRole(nodes, workspace.userId);
+
+ if (!folder || folder.type !== 'folder' || !role) {
+ return null;
+ }
+
const currentLayout =
folderLayouts.find((l) => l.value === layout) ?? folderLayouts[0];
- const isDialogOpenedRef = React.useRef(false);
-
const openFileDialog = async () => {
if (isDialogOpenedRef.current) {
return;
@@ -97,58 +118,61 @@ export const FolderContainer = ({ nodeId }: FolderContainerProps) => {
};
return (
- <Dropzone
- text="Drop files here to upload them in the folder"
- onDrop={(files) => {
- 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 flex-row justify-between">
- <div className="flex flex-row gap-2">
- <Button type="button" variant="outline" onClick={openFileDialog}>
- <Upload className="mr-2 size-4" /> Upload
- </Button>
- </div>
- <div className="flex flex-row gap-2">
- <Button type="button" variant="outline" size="icon" disabled>
- <Filter className="size-4" />
- </Button>
-
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button type="button" variant="outline" size="icon">
- {currentLayout && <currentLayout.icon className="size-4" />}
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="mr-5 w-56">
- <DropdownMenuLabel>Layout</DropdownMenuLabel>
- <DropdownMenuSeparator />
- {folderLayouts.map((item) => (
- <DropdownMenuItem
- key={item.value}
- onClick={() => setLayout(item.value)}
- >
- <div className="flex w-full flex-row items-center gap-2">
- <item.icon className="size-4" />
- <p className="flex-grow">{item.name}</p>
- {layout === item.value && <Check className="size-4" />}
- </div>
- </DropdownMenuItem>
- ))}
- </DropdownMenuContent>
- </DropdownMenu>
+ <div className="flex h-full w-full flex-col">
+ <FolderHeader nodes={nodes} folder={folder} role={role} />
+ <Dropzone
+ text="Drop files here to upload them in the folder"
+ onDrop={(files) => {
+ 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 flex-row justify-between">
+ <div className="flex flex-row gap-2">
+ <Button type="button" variant="outline" onClick={openFileDialog}>
+ <Upload className="mr-2 size-4" /> Upload
+ </Button>
+ </div>
+ <div className="flex flex-row gap-2">
+ <Button type="button" variant="outline" size="icon" disabled>
+ <Filter className="size-4" />
+ </Button>
+
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button type="button" variant="outline" size="icon">
+ {currentLayout && <currentLayout.icon className="size-4" />}
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent className="mr-5 w-56">
+ <DropdownMenuLabel>Layout</DropdownMenuLabel>
+ <DropdownMenuSeparator />
+ {folderLayouts.map((item) => (
+ <DropdownMenuItem
+ key={item.value}
+ onClick={() => setLayout(item.value)}
+ >
+ <div className="flex w-full flex-row items-center gap-2">
+ <item.icon className="size-4" />
+ <p className="flex-grow">{item.name}</p>
+ {layout === item.value && <Check className="size-4" />}
+ </div>
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
</div>
+ <ScrollArea className="flex-grow">
+ <FolderFiles id={nodeId} name="Folder" layout={layout} />
+ </ScrollArea>
</div>
- <ScrollArea className="flex-grow">
- <FolderFiles id={nodeId} name="Folder" layout={layout} />
- </ScrollArea>
- </div>
- {/* <FolderUploads
+ {/* <FolderUploads
uploads={Object.values(uploads)}
open={openUploads}
setOpen={setOpenUploads}
/> */}
- </Dropzone>
+ </Dropzone>
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/folders/folder-header.tsx b/apps/desktop/src/renderer/components/folders/folder-header.tsx
new file mode 100644
index 00000000..1fac8769
--- /dev/null
+++ b/apps/desktop/src/renderer/components/folders/folder-header.tsx
@@ -0,0 +1,25 @@
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
+import { FolderNode, Node, NodeRole } from '@colanode/core';
+import { Header } from '@/renderer/components/ui/header';
+import { ContainerBreadcrumb } from '@/renderer/components/workspaces/containers/container-breadcrumb';
+import { FolderSettings } from '@/renderer/components/folders/folder-settings';
+
+interface FolderHeaderProps {
+ nodes: Node[];
+ folder: FolderNode;
+ role: NodeRole;
+}
+
+export const FolderHeader = ({ nodes, folder }: FolderHeaderProps) => {
+ return (
+ <Header>
+ <div className="flex w-full items-center gap-2 px-4">
+ <ContainerBreadcrumb nodes={nodes} />
+ <div className="flex items-center gap-2">
+ <NodeCollaboratorsPopover nodeId={folder.id} nodes={nodes} />
+ <FolderSettings nodeId={folder.id} />
+ </div>
+ </div>
+ </Header>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx
new file mode 100644
index 00000000..1388ad40
--- /dev/null
+++ b/apps/desktop/src/renderer/components/pages/page-breadcrumb-item.tsx
@@ -0,0 +1,20 @@
+import { PageNode } from '@colanode/core';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+
+interface PageBreadcrumbItemProps {
+ node: PageNode;
+}
+
+export const PageBreadcrumbItem = ({ node }: PageBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={node.id}
+ name={node.attributes.name}
+ avatar={node.attributes.avatar}
+ />
+ <span>{node.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 8a5835af..91639100 100644
--- a/apps/desktop/src/renderer/components/pages/page-container.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-container.tsx
@@ -1,14 +1,44 @@
import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { Document } from '@/renderer/components/documents/document';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { extractNodeRole } from '@colanode/core';
+import { PageHeader } from '@/renderer/components/pages/page-header';
interface PageContainerProps {
nodeId: string;
}
export const PageContainer = ({ nodeId }: PageContainerProps) => {
+ const workspace = useWorkspace();
+ const { data, isPending } = useQuery({
+ type: 'node_with_ancestors_get',
+ nodeId,
+ userId: workspace.userId,
+ });
+
+ if (isPending) {
+ return null;
+ }
+
+ const nodes = data ?? [];
+ const page = nodes.find((node) => node.id === nodeId);
+ const role = extractNodeRole(nodes, workspace.userId);
+
+ if (!page || page.type !== 'page' || !role) {
+ return null;
+ }
+
return (
- <ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
- <Document nodeId={nodeId} />
- </ScrollArea>
+ <div className="flex h-full w-full flex-col">
+ <PageHeader nodes={nodes} page={page} role={role} />
+ <ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
+ <Document
+ nodeId={page.id}
+ content={page.attributes.content}
+ versionId={page.versionId}
+ />
+ </ScrollArea>
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/pages/page-header.tsx b/apps/desktop/src/renderer/components/pages/page-header.tsx
new file mode 100644
index 00000000..857fa897
--- /dev/null
+++ b/apps/desktop/src/renderer/components/pages/page-header.tsx
@@ -0,0 +1,25 @@
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
+import { PageNode, Node, NodeRole } from '@colanode/core';
+import { Header } from '@/renderer/components/ui/header';
+import { ContainerBreadcrumb } from '@/renderer/components/workspaces/containers/container-breadcrumb';
+import { PageSettings } from '@/renderer/components/pages/page-settings';
+
+interface PageHeaderProps {
+ nodes: Node[];
+ page: PageNode;
+ role: NodeRole;
+}
+
+export const PageHeader = ({ nodes, page }: PageHeaderProps) => {
+ return (
+ <Header>
+ <div className="flex w-full items-center gap-2 px-4">
+ <ContainerBreadcrumb nodes={nodes} />
+ <div className="flex items-center gap-2">
+ <NodeCollaboratorsPopover nodeId={page.id} nodes={nodes} />
+ <PageSettings nodeId={page.id} />
+ </div>
+ </div>
+ </Header>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx
new file mode 100644
index 00000000..d87b0099
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/record-breadcrumb-item.tsx
@@ -0,0 +1,20 @@
+import { RecordNode } from '@colanode/core';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+
+interface RecordBreadcrumbItemProps {
+ node: RecordNode;
+}
+
+export const RecordBreadcrumbItem = ({ node }: RecordBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={node.id}
+ name={node.attributes.name}
+ avatar={node.attributes.avatar}
+ />
+ <span>{node.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 d41c6687..798701ab 100644
--- a/apps/desktop/src/renderer/components/records/record-container.tsx
+++ b/apps/desktop/src/renderer/components/records/record-container.tsx
@@ -6,6 +6,8 @@ import { Document } from '@/renderer/components/documents/document';
import { Separator } from '@/renderer/components/ui/separator';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { RecordProvider } from '@/renderer/components/records/record-provider';
+import { extractNodeRole } from '@colanode/core';
+import { RecordHeader } from '@/renderer/components/records/record-header';
interface RecordContainerProps {
nodeId: string;
@@ -13,9 +15,8 @@ interface RecordContainerProps {
export const RecordContainer = ({ nodeId }: RecordContainerProps) => {
const workspace = useWorkspace();
-
const { data, isPending } = useQuery({
- type: 'node_get',
+ type: 'node_with_ancestors_get',
nodeId,
userId: workspace.userId,
});
@@ -24,19 +25,30 @@ export const RecordContainer = ({ nodeId }: RecordContainerProps) => {
return null;
}
- if (!data || data.type !== 'record') {
+ const nodes = data ?? [];
+ const record = nodes.find((node) => node.id === nodeId);
+ const role = extractNodeRole(nodes, workspace.userId);
+
+ if (!record || record.type !== 'record' || !role) {
return null;
}
return (
- <Database databaseId={data.attributes.databaseId}>
- <ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
- <RecordProvider record={data}>
- <RecordAttributes />
- </RecordProvider>
- <Separator className="my-4 w-full" />
- <Document nodeId={nodeId} />
- </ScrollArea>
- </Database>
+ <div className="flex h-full w-full flex-col">
+ <RecordHeader nodes={nodes} record={record} role={role} />
+ <Database databaseId={record.attributes.databaseId}>
+ <ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
+ <RecordProvider record={record}>
+ <RecordAttributes />
+ </RecordProvider>
+ <Separator className="my-4 w-full" />
+ <Document
+ nodeId={record.id}
+ content={record.attributes.content}
+ versionId={record.versionId}
+ />
+ </ScrollArea>
+ </Database>
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/records/record-header.tsx b/apps/desktop/src/renderer/components/records/record-header.tsx
new file mode 100644
index 00000000..dc70f884
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/record-header.tsx
@@ -0,0 +1,25 @@
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
+import { RecordNode, Node, NodeRole } from '@colanode/core';
+import { Header } from '@/renderer/components/ui/header';
+import { ContainerBreadcrumb } from '@/renderer/components/workspaces/containers/container-breadcrumb';
+import { RecordSettings } from '@/renderer/components/records/record-settings';
+
+interface RecordHeaderProps {
+ nodes: Node[];
+ record: RecordNode;
+ role: NodeRole;
+}
+
+export const RecordHeader = ({ nodes, record }: RecordHeaderProps) => {
+ return (
+ <Header>
+ <div className="flex w-full items-center gap-2 px-4">
+ <ContainerBreadcrumb nodes={nodes} />
+ <div className="flex items-center gap-2">
+ <NodeCollaboratorsPopover nodeId={record.id} nodes={nodes} />
+ <RecordSettings nodeId={record.id} />
+ </div>
+ </div>
+ </Header>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx
new file mode 100644
index 00000000..434456c8
--- /dev/null
+++ b/apps/desktop/src/renderer/components/spaces/space-breadcrumb-item.tsx
@@ -0,0 +1,20 @@
+import { SpaceNode } from '@colanode/core';
+import { Avatar } from '@/renderer/components/avatars/avatar';
+
+interface SpaceBreadcrumbItemProps {
+ node: SpaceNode;
+}
+
+export const SpaceBreadcrumbItem = ({ node }: SpaceBreadcrumbItemProps) => {
+ return (
+ <div className="flex items-center space-x-2">
+ <Avatar
+ size="small"
+ id={node.id}
+ name={node.attributes.name}
+ avatar={node.attributes.avatar}
+ />
+ <span>{node.attributes.name}</span>
+ </div>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
index 53959afe..e24ff357 100644
--- a/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-settings-dialog.tsx
@@ -89,7 +89,7 @@ export const SpaceSettingsDialog = ({
className="focus-visible:ring-0 focus-visible:ring-offset-0"
value="collaborators"
>
- <NodeCollaborators nodeId={id} />
+ <NodeCollaborators nodeId={id} nodes={[]} />
</TabsContent>
<TabsContent
key="tab-content-delete"
diff --git a/apps/desktop/src/renderer/components/ui/header.tsx b/apps/desktop/src/renderer/components/ui/header.tsx
new file mode 100644
index 00000000..f34a959f
--- /dev/null
+++ b/apps/desktop/src/renderer/components/ui/header.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { cn } from '@/lib/utils';
+
+const Header = React.forwardRef<
+ HTMLHeadingElement,
+ React.HTMLAttributes<HTMLHeadingElement>
+>(({ className, ...props }, ref) => (
+ <header
+ ref={ref}
+ className={cn(
+ 'flex h-16 w-full shrink-0 items-center gap-2 transition-[width,height] ease-linear',
+ className
+ )}
+ {...props}
+ />
+));
+Header.displayName = 'Header';
+
+export { Header };
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item-popover.tsx b/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item-popover.tsx
deleted file mode 100644
index 95348f7d..00000000
--- a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item-popover.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import React from 'react';
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from '@/renderer/components/ui/popover';
-import { BreadcrumbNode } from '@/types/workspaces';
-import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
-import { useMutation } from '@/renderer/hooks/use-mutation';
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { AvatarPopover } from '@/renderer/components/avatars/avatar-popover';
-import { Avatar } from '@/renderer/components/avatars/avatar';
-import { Button } from '@/renderer/components/ui/button';
-
-interface BreadcrumbItemPopoverProps {
- node: BreadcrumbNode;
- children: React.ReactNode;
-}
-
-export const BreadcrumbItemPopover = ({
- node,
- children,
-}: BreadcrumbItemPopoverProps) => {
- const workspace = useWorkspace();
- const { mutate, isPending } = useMutation();
-
- return (
- <Popover>
- <PopoverTrigger>{children}</PopoverTrigger>
- <PopoverContent className="w-96 p-3">
- <div className="flex flex-row items-center gap-3">
- <AvatarPopover
- onPick={(avatar) => {
- if (isPending) return;
- mutate({
- input: {
- type: 'node_attribute_set',
- nodeId: node.id,
- path: 'avatar',
- value: avatar,
- userId: workspace.userId,
- },
- });
- }}
- >
- <Button type="button" variant="outline" size="icon">
- <Avatar
- size="small"
- id={node.id}
- name={node.name}
- avatar={node.avatar}
- />
- </Button>
- </AvatarPopover>
- <SmartTextInput
- value={node.name}
- placeholder="Unnamed"
- onChange={(newName) => {
- if (isPending) return;
- if (newName === node.name) return;
-
- mutate({
- input: {
- type: 'node_attribute_set',
- nodeId: node.id,
- path: 'name',
- value: newName,
- userId: workspace.userId,
- },
- });
- }}
- />
- </div>
- </PopoverContent>
- </Popover>
- );
-};
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx b/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx
deleted file mode 100644
index cf76b459..00000000
--- a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { cn } from '@/lib/utils';
-import { Avatar } from '@/renderer/components/avatars/avatar';
-import { BreadcrumbNode } from '@/types/workspaces';
-import { NodeTypes } from '@colanode/core';
-
-interface BreadcrumbNodeProps {
- node: BreadcrumbNode;
- className?: string;
-}
-
-export const BreadcrumbItem = ({ node, className }: BreadcrumbNodeProps) => {
- let name = node.name ?? 'Unnamed';
- if (node.type === NodeTypes.Message) {
- name = 'Message';
- }
-
- return (
- <div className={cn('flex items-center space-x-2', className)}>
- {node.avatar && (
- <Avatar
- size="small"
- id={node.id}
- name={node.name}
- avatar={node.avatar}
- />
- )}
- <span>{name}</span>
- </div>
- );
-};
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/chat-breadcrumb.tsx b/apps/desktop/src/renderer/components/workspaces/containers/chat-breadcrumb.tsx
deleted file mode 100644
index 828c9eb3..00000000
--- a/apps/desktop/src/renderer/components/workspaces/containers/chat-breadcrumb.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useWorkspace } from '@/renderer/contexts/workspace';
-import { useQuery } from '@/renderer/hooks/use-query';
-import {
- Breadcrumb as BreadcrumbWrapper,
- BreadcrumbItem as BreadcrumbItemWrapper,
- BreadcrumbList,
-} from '@/renderer/components/ui/breadcrumb';
-import { BreadcrumbItem } from '@/renderer/components/workspaces/containers/breadcrumb-item';
-
-interface ChatBreadcrumbProps {
- chatId: string;
-}
-
-export const ChatBreadcrumb = ({ chatId }: ChatBreadcrumbProps) => {
- const workspace = useWorkspace();
- const { data, isPending } = useQuery({
- type: 'chat_get',
- chatId,
- userId: workspace.userId,
- });
-
- if (isPending || !data) {
- return null;
- }
-
- return (
- <BreadcrumbWrapper>
- <BreadcrumbList>
- <BreadcrumbItemWrapper>
- <BreadcrumbItem
- node={{
- id: data.id,
- type: 'chat',
- name: data.name,
- avatar: data.avatar,
- }}
- />
- </BreadcrumbItemWrapper>
- </BreadcrumbList>
- </BreadcrumbWrapper>
- );
-};
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/container-breadcrumb-item.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container-breadcrumb-item.tsx
new file mode 100644
index 00000000..c667d314
--- /dev/null
+++ b/apps/desktop/src/renderer/components/workspaces/containers/container-breadcrumb-item.tsx
@@ -0,0 +1,38 @@
+import { Node } from '@colanode/core';
+import { SpaceBreadcrumbItem } from '@/renderer/components/spaces/space-breadcrumb-item';
+import { ChannelBreadcrumbItem } from '@/renderer/components/channels/channel-breadcrumb-item';
+import { ChatBreadcrumbItem } from '@/renderer/components/chats/chat-breadcrumb-item';
+import { PageBreadcrumbItem } from '@/renderer/components/pages/page-breadcrumb-item';
+import { DatabaseBreadcrumbItem } from '@/renderer/components/databases/database-breadcrumb-item';
+import { RecordBreadcrumbItem } from '@/renderer/components/records/record-breadcrumb-item';
+import { FolderBreadcrumbItem } from '@/renderer/components/folders/folder-breadcrumb-item';
+import { FileBreadcrumbItem } from '@/renderer/components/files/file-breadcrumb-item';
+
+interface ContainerBreadcrumbItemProps {
+ node: Node;
+}
+
+export const ContainerBreadcrumbItem = ({
+ node,
+}: ContainerBreadcrumbItemProps) => {
+ switch (node.type) {
+ case 'space':
+ return <SpaceBreadcrumbItem node={node} />;
+ case 'channel':
+ return <ChannelBreadcrumbItem node={node} />;
+ case 'chat':
+ return <ChatBreadcrumbItem node={node} />;
+ case 'page':
+ return <PageBreadcrumbItem node={node} />;
+ case 'database':
+ return <DatabaseBreadcrumbItem node={node} />;
+ case 'record':
+ return <RecordBreadcrumbItem node={node} />;
+ case 'folder':
+ return <FolderBreadcrumbItem node={node} />;
+ case 'file':
+ return <FileBreadcrumbItem node={node} />;
+ default:
+ return null;
+ }
+};
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container-breadcrumb.tsx
similarity index 50%
rename from apps/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
rename to apps/desktop/src/renderer/components/workspaces/containers/container-breadcrumb.tsx
index 7d96df69..18409cf8 100644
--- a/apps/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/containers/container-breadcrumb.tsx
@@ -1,10 +1,11 @@
import React from 'react';
+import { Node, NodeTypes } from '@colanode/core';
import {
- Breadcrumb as BreadcrumbWrapper,
- BreadcrumbEllipsis,
- BreadcrumbItem as BreadcrumbItemWrapper,
+ Breadcrumb,
+ BreadcrumbItem,
BreadcrumbList,
BreadcrumbSeparator,
+ BreadcrumbEllipsis,
} from '@/renderer/components/ui/breadcrumb';
import {
DropdownMenu,
@@ -12,67 +13,47 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from '@/renderer/components/ui/dropdown-menu';
-import { NodeTypes } from '@colanode/core';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { BreadcrumbItem } from '@/renderer/components/workspaces/containers/breadcrumb-item';
-import { BreadcrumbItemPopover } from '@/renderer/components/workspaces/containers/breadcrumb-item-popover';
-import { useQuery } from '@/renderer/hooks/use-query';
+import { ContainerBreadcrumbItem } from '@/renderer/components/workspaces/containers/container-breadcrumb-item';
-interface BreadcrumbProps {
- nodeId: string;
+interface ContainerBreadcrumbProps {
+ nodes: Node[];
}
-export const Breadcrumb = ({ nodeId }: BreadcrumbProps) => {
+const isClickable = (type: string) =>
+ type !== NodeTypes.Space && type !== NodeTypes.Message;
+
+export const ContainerBreadcrumb = ({ nodes }: ContainerBreadcrumbProps) => {
const workspace = useWorkspace();
- const { data, isPending } = useQuery({
- type: 'breadcrumb_list',
- nodeId,
- userId: workspace.userId,
- });
- if (isPending || !data) {
- return null;
- }
+ // Show ellipsis if we have more than 3 nodes (first + last two)
+ const showEllipsis = nodes.length > 3;
- const showEllipsis = data.length > 2;
- const visibleNodes = showEllipsis ? [data[0], data[data.length - 1]] : data;
- const ellipsisNodes = showEllipsis ? data.slice(1, -1) : [];
+ // Get visible nodes: first node + last two nodes
+ const visibleNodes = showEllipsis ? [nodes[0], ...nodes.slice(-2)] : nodes;
- const isClickable = (type: string) =>
- type !== NodeTypes.Space && type !== NodeTypes.Message;
+ // Get middle nodes for ellipsis (everything except first and last two)
+ const ellipsisNodes = showEllipsis ? nodes.slice(1, -2) : [];
return (
- <BreadcrumbWrapper>
+ <Breadcrumb className="flex-grow">
<BreadcrumbList>
- {visibleNodes.map((breadcrumbNode, index) => (
- <React.Fragment key={breadcrumbNode.id}>
+ {visibleNodes.map((node, index) => (
+ <React.Fragment key={node.id}>
{index > 0 && <BreadcrumbSeparator />}
- <BreadcrumbItemWrapper
+ <BreadcrumbItem
onClick={() => {
- if (isClickable(breadcrumbNode.type)) {
- workspace.navigateToNode(breadcrumbNode.id);
+ if (isClickable(node.type)) {
+ workspace.navigateToNode(node.id);
}
}}
>
- {breadcrumbNode.id === nodeId ? (
- <BreadcrumbItemPopover node={breadcrumbNode}>
- <BreadcrumbItem node={breadcrumbNode} />
- </BreadcrumbItemPopover>
- ) : (
- <BreadcrumbItem
- node={breadcrumbNode}
- className={
- isClickable(breadcrumbNode.type)
- ? 'hover:cursor-pointer hover:text-foreground'
- : ''
- }
- />
- )}
- </BreadcrumbItemWrapper>
+ <ContainerBreadcrumbItem node={node} />
+ </BreadcrumbItem>
{showEllipsis && index === 0 && (
<React.Fragment>
<BreadcrumbSeparator />
- <BreadcrumbItemWrapper>
+ <BreadcrumbItem>
<DropdownMenu>
<DropdownMenuTrigger className="flex items-center gap-1">
<BreadcrumbEllipsis className="h-4 w-4" />
@@ -89,23 +70,24 @@ export const Breadcrumb = ({ nodeId }: BreadcrumbProps) => {
disabled={!isClickable(ellipsisNode.type)}
>
<BreadcrumbItem
- node={ellipsisNode}
className={
isClickable(ellipsisNode.type)
? 'hover:cursor-pointer hover:text-foreground'
: ''
}
- />
+ >
+ <ContainerBreadcrumbItem node={ellipsisNode} />
+ </BreadcrumbItem>
</DropdownMenuItem>
))}
</DropdownMenuContent>
</DropdownMenu>
- </BreadcrumbItemWrapper>
+ </BreadcrumbItem>
</React.Fragment>
)}
</React.Fragment>
))}
</BreadcrumbList>
- </BreadcrumbWrapper>
+ </Breadcrumb>
);
};
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/container-header.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container-header.tsx
deleted file mode 100644
index 3d70f7ac..00000000
--- a/apps/desktop/src/renderer/components/workspaces/containers/container-header.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { getIdType, IdType } from '@colanode/core';
-import { Breadcrumb } from '@/renderer/components/workspaces/containers/breadcrumb';
-import { ChatBreadcrumb } from '@/renderer/components/workspaces/containers/chat-breadcrumb';
-import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
-import { SidebarTrigger } from '@/renderer/components/ui/sidebar';
-import { Separator } from '@/renderer/components/ui/separator';
-import { ContainerSettings } from '@/renderer/components/workspaces/containers/container-settings';
-
-interface ContainerHeaderProps {
- nodeId: string;
-}
-
-export const ContainerHeader = ({ nodeId }: ContainerHeaderProps) => {
- const idType = getIdType(nodeId);
- return (
- <header className="flex h-16 w-full shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12">
- <div className="flex w-full items-center gap-2 px-4">
- <SidebarTrigger className="-ml-1" />
- <Separator orientation="vertical" className="mr-2 h-4" />
- <div className="flex-grow">
- {idType === IdType.Chat ? (
- <ChatBreadcrumb chatId={nodeId} />
- ) : (
- <Breadcrumb nodeId={nodeId} />
- )}
- </div>
-
- <div className="flex items-center gap-2">
- <NodeCollaboratorsPopover nodeId={nodeId} />
- <ContainerSettings nodeId={nodeId} />
- </div>
- </div>
- </header>
- );
-};
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/container-settings.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container-settings.tsx
deleted file mode 100644
index dfe06839..00000000
--- a/apps/desktop/src/renderer/components/workspaces/containers/container-settings.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { IdType, getIdType } from '@colanode/core';
-import { match } from 'ts-pattern';
-import { ChannelSettings } from '@/renderer/components/channels/channel-settings';
-import { PageSettings } from '@/renderer/components/pages/page-settings';
-import { DatabaseSettings } from '@/renderer/components/databases/database-settings';
-import { RecordSettings } from '@/renderer/components/records/record-settings';
-import { FolderSettings } from '@/renderer/components/folders/folder-settings';
-import { FileSettings } from '@/renderer/components/files/file-settings';
-
-interface ContainerSettingsProps {
- nodeId: string;
-}
-
-export const ContainerSettings = ({ nodeId }: ContainerSettingsProps) => {
- const idType = getIdType(nodeId);
- return match(idType)
- .with(IdType.Channel, () => <ChannelSettings nodeId={nodeId} />)
- .with(IdType.Page, () => <PageSettings nodeId={nodeId} />)
- .with(IdType.Database, () => <DatabaseSettings nodeId={nodeId} />)
- .with(IdType.Record, () => <RecordSettings nodeId={nodeId} />)
- .with(IdType.Folder, () => <FolderSettings nodeId={nodeId} />)
- .with(IdType.File, () => <FileSettings nodeId={nodeId} />)
- .otherwise(() => null);
-};
diff --git a/apps/desktop/src/renderer/components/workspaces/containers/container.tsx b/apps/desktop/src/renderer/components/workspaces/containers/container.tsx
index 613bd716..732ad2b9 100644
--- a/apps/desktop/src/renderer/components/workspaces/containers/container.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/containers/container.tsx
@@ -1,8 +1,6 @@
-import { match } from 'ts-pattern';
import { useParams } from 'react-router-dom';
import { PageContainer } from '@/renderer/components/pages/page-container';
import { ChannelContainer } from '@/renderer/components/channels/channel-container';
-import { ContainerHeader } from '@/renderer/components/workspaces/containers/container-header';
import { DatabaseContainer } from '@/renderer/components/databases/database-container';
import { RecordContainer } from '@/renderer/components/records/record-container';
import { ChatContainer } from '@/renderer/components/chats/chat-container';
@@ -17,18 +15,22 @@ export const Container = () => {
}
const idType = getIdType(nodeId);
- return (
- <div className="flex h-full w-full flex-col">
- <ContainerHeader nodeId={nodeId} />
- {match(idType)
- .with(IdType.Channel, () => <ChannelContainer nodeId={nodeId} />)
- .with(IdType.Page, () => <PageContainer nodeId={nodeId} />)
- .with(IdType.Database, () => <DatabaseContainer nodeId={nodeId} />)
- .with(IdType.Record, () => <RecordContainer nodeId={nodeId} />)
- .with(IdType.Chat, () => <ChatContainer nodeId={nodeId} />)
- .with(IdType.Folder, () => <FolderContainer nodeId={nodeId} />)
- .with(IdType.File, () => <FileContainer nodeId={nodeId} />)
- .otherwise(() => null)}
- </div>
- );
+ switch (idType) {
+ case IdType.Channel:
+ return <ChannelContainer nodeId={nodeId} />;
+ case IdType.Page:
+ return <PageContainer nodeId={nodeId} />;
+ case IdType.Database:
+ return <DatabaseContainer nodeId={nodeId} />;
+ case IdType.Record:
+ return <RecordContainer nodeId={nodeId} />;
+ case IdType.Chat:
+ return <ChatContainer nodeId={nodeId} />;
+ case IdType.Folder:
+ return <FolderContainer nodeId={nodeId} />;
+ case IdType.File:
+ return <FileContainer nodeId={nodeId} />;
+ default:
+ return null;
+ }
};
diff --git a/apps/desktop/src/types/nodes.ts b/apps/desktop/src/types/nodes.ts
index e1c92b28..5ab2d9d6 100644
--- a/apps/desktop/src/types/nodes.ts
+++ b/apps/desktop/src/types/nodes.ts
@@ -1,19 +1,7 @@
-export type NodeCollaboratorsWrapper = {
- direct: NodeCollaborator[];
- inherit: InheritNodeCollaboratorsGroup[];
-};
-
-export type InheritNodeCollaboratorsGroup = {
- id: string;
- name: string;
- avatar: string | null;
- collaborators: NodeCollaborator[];
-};
+import { NodeRole } from '@colanode/core';
export type NodeCollaborator = {
- id: string;
- name: string;
- email: string;
- avatar: string | null;
- role: string;
+ nodeId: string;
+ collaboratorId: string;
+ role: NodeRole;
};
diff --git a/packages/core/src/lib/nodes.ts b/packages/core/src/lib/nodes.ts
index 7bf006cf..318c4595 100644
--- a/packages/core/src/lib/nodes.ts
+++ b/packages/core/src/lib/nodes.ts
@@ -10,6 +10,14 @@ export const extractNodeCollaborators = (
return {};
};
+export const extractNodeName = (attributes: NodeAttributes): string | null => {
+ if ('name' in attributes && attributes.name) {
+ return attributes.name as string;
+ }
+
+ return null;
+};
+
export const extractNodeRole = (
ancestors: Node[],
collaboratorId: string