Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Load most of the data from sqlite
Hakan Shehuc2f527e87823
diff --git a/desktop/src/components/app.tsx b/desktop/src/components/app.tsxindex 797a58d1..a607a89c 100644--- a/desktop/src/components/app.tsx+++ b/desktop/src/components/app.tsx@@ -19,14 +19,7 @@ export const App = observer(() => {.init().then(({ accounts, workspaces }) => {store.setAccounts(accounts);-- workspaces.forEach((workspace) => {- store.addWorkspace(workspace.workspace);-- const workspaceStore = store.getWorkspace(workspace.workspace.id);- workspaceStore.setNodes(workspace.nodes);- });-+ store.setWorkspaces(workspaces);store.setLoaded();}).catch((error) => {diff --git a/desktop/src/components/workspaces/container-header.tsx b/desktop/src/components/workspaces/container-header.tsxindex dfae93aa..5d8ba268 100644--- a/desktop/src/components/workspaces/container-header.tsx+++ b/desktop/src/components/workspaces/container-header.tsx@@ -1,12 +1,13 @@import React from 'react';import { Node } from '@/types/nodes';import { Avatar } from '@/components/ui/avatar';+import { observer } from 'mobx-react-lite';interface ContainerHeaderProps {node: Node;}-export const ContainerHeader = ({ node }: ContainerHeaderProps) => {+export const ContainerHeader = observer(({ node }: ContainerHeaderProps) => {const name = node.attrs.name ?? 'Untitled';const avatar = node.attrs.avatar;return (@@ -17,4 +18,4 @@ export const ContainerHeader = ({ node }: ContainerHeaderProps) => {</div></div>);-};+});diff --git a/desktop/src/components/workspaces/container.tsx b/desktop/src/components/workspaces/container.tsxindex 5de682e8..b52f8033 100644--- a/desktop/src/components/workspaces/container.tsx+++ b/desktop/src/components/workspaces/container.tsx@@ -1,20 +1,19 @@import React from 'react';import { observer } from 'mobx-react-lite';-import { useWorkspace } from '@/contexts/workspace';import { match } from 'ts-pattern';import { NodeTypes } from '@/lib/constants';import { PageContainerNode } from '@/components/pages/page-container-node';import { ChannelContainerNode } from '@/components/channels/channel-container-node';import { ContainerHeader } from '@/components/workspaces/container-header';import { useParams } from 'react-router-dom';+import { useContainer } from '@/hooks/use-container';export const Container = observer(() => {const { nodeId } = useParams<{ nodeId: string }>();- const workspace = useWorkspace();+ const { node } = useContainer(nodeId);- const node = workspace.getNodes().find((node) => node.id === nodeId);- if (node == null) {- return <p>Node not found.</p>;+ if (!node) {+ return null;}return (diff --git a/desktop/src/components/workspaces/sidebar-header.tsx b/desktop/src/components/workspaces/sidebar-header.tsxindex c8ce8e92..e791b5d1 100644--- a/desktop/src/components/workspaces/sidebar-header.tsx+++ b/desktop/src/components/workspaces/sidebar-header.tsx@@ -1,10 +1,14 @@-import React from "react";-import {useWorkspace} from "@/contexts/workspace";-import {Popover, PopoverContent, PopoverTrigger} from "@/components/ui/popover";-import {Icon} from "@/components/ui/icon";-import {Avatar} from "@/components/ui/avatar";-import {useStore} from "@/contexts/store";-import {observer} from "mobx-react-lite";+import React from 'react';+import { useWorkspace } from '@/contexts/workspace';+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from '@/components/ui/popover';+import { Icon } from '@/components/ui/icon';+import { Avatar } from '@/components/ui/avatar';+import { useStore } from '@/contexts/store';+import { observer } from 'mobx-react-lite';export const SidebarHeader = observer(() => {const store = useStore();@@ -16,58 +20,62 @@ export const SidebarHeader = observer(() => {return (<Popover><PopoverTrigger asChild>- <div- className="mb-1 flex h-12 cursor-pointer items-center justify-between border-b-2 border-gray-100 p-2 text-foreground/80 hover:bg-gray-200">+ <div className="mb-1 flex h-12 cursor-pointer items-center justify-between border-b-2 border-gray-100 p-2 text-foreground/80 hover:bg-gray-200"><div className="flex flex-grow items-center gap-2">- <Avatar id={workspace.id} name={workspace.name} className="h-7 w-7"/>- <p className="flex-grow">- {workspace.name}- </p>+ <Avatar+ id={workspace.id}+ name={workspace.name}+ className="h-7 w-7"+ />+ <p className="flex-grow">{workspace.name}</p></div>- <Icon name="expand-up-down-line"/>+ <Icon name="expand-up-down-line" /></div></PopoverTrigger>- <PopoverContent align="start" className="flex flex-col gap-2 w-96 p-3">+ <PopoverContent align="start" className="flex w-96 flex-col gap-2 p-3"><h2 className="text-sm font-semibold">Account</h2><div className="flex flex-grow items-start gap-2">- <Avatar id={account.id} name={account.name} className="h-7 w-7 mt-1"/>- <div className="flex-grow flex flex-col">+ <Avatar+ id={account.id}+ name={account.name}+ className="mt-1 h-7 w-7"+ />+ <div className="flex flex-grow flex-col"><p>{account.name}</p><p className="text-xs text-muted-foreground">{account.email}</p></div></div>- <hr className="-mx-1 my-1 h-px bg-muted"/>+ <hr className="-mx-1 my-1 h-px bg-muted" /><h2 className="text-sm font-semibold">Workspaces</h2><ul className="flex flex-col gap-0.5">{workspaces.map((w) => {return (- <li key={w.id}- className="flex flex-row p-2 pl-1 items-center gap-2 hover:cursor-pointer hover:bg-gray-100 rounded-md">- <Avatar id={w.id} name={w.name} className="h-7 w-7"/>+ <li+ key={w.id}+ className="flex flex-row items-center gap-2 rounded-md p-2 pl-1 hover:cursor-pointer hover:bg-gray-100"+ >+ <Avatar id={w.id} name={w.name} className="h-7 w-7" /><p>{w.name}</p></li>);})}</ul>- <hr/>+ <hr /><div className="flex flex-col gap-1">- <button- className="flex flex-row items-center gap-2 outline-none hover:bg-gray-100 hover:cursor-pointer text-sm p-1 pl-0 rounded-md">- <Icon name="add-line"/>+ <button className="flex flex-row items-center gap-2 rounded-md p-1 pl-0 text-sm outline-none hover:cursor-pointer hover:bg-gray-100">+ <Icon name="add-line" /><span>Create workspace</span></button>- <button- className="flex flex-row items-center gap-2 outline-none hover:bg-gray-100 hover:cursor-pointer text-sm p-1 pl-0 rounded-md">- <Icon name="settings-4-line"/>+ <button className="flex flex-row items-center gap-2 rounded-md p-1 pl-0 text-sm outline-none hover:cursor-pointer hover:bg-gray-100">+ <Icon name="settings-4-line" /><span>Settings</span></button>- <button- className="flex flex-row items-center gap-2 outline-none hover:bg-gray-100 hover:cursor-pointer text-sm p-1 pl-0 rounded-md">- <Icon name="logout-circle-r-line"/>+ <button className="flex flex-row items-center gap-2 rounded-md p-1 pl-0 text-sm outline-none hover:cursor-pointer hover:bg-gray-100">+ <Icon name="logout-circle-r-line" /><span>Logout</span></button></div></PopoverContent></Popover>- )-});\ No newline at end of file+ );+});diff --git a/desktop/src/components/workspaces/sidebar-node-children.tsx b/desktop/src/components/workspaces/sidebar-node-children.tsxindex b4188a8c..9338cf72 100644--- a/desktop/src/components/workspaces/sidebar-node-children.tsx+++ b/desktop/src/components/workspaces/sidebar-node-children.tsx@@ -1,8 +1,8 @@import React from 'react';import { Node } from '@/types/nodes';import { observer } from 'mobx-react-lite';-import { useWorkspace } from '@/contexts/workspace';import { SidebarNode } from '@/components/workspaces/sidebar-node';+import { useSidebar } from '@/contexts/sidebar';interface SidebarNodeChildrenProps {node: Node;@@ -10,9 +10,8 @@ interface SidebarNodeChildrenProps {export const SidebarNodeChildren = observer(({ node }: SidebarNodeChildrenProps) => {- const workspace = useWorkspace();- const children: Node[] = workspace- .getNodes()+ const sidebar = useSidebar();+ const children: Node[] = sidebar.nodes.filter((n) => n.parentId === node.id).sort((a, b) => {if (a.index < b.index) {diff --git a/desktop/src/components/workspaces/sidebar-node.tsx b/desktop/src/components/workspaces/sidebar-node.tsxindex a0471854..d127aec2 100644--- a/desktop/src/components/workspaces/sidebar-node.tsx+++ b/desktop/src/components/workspaces/sidebar-node.tsx@@ -1,20 +1,20 @@-import React from "react";-import {Node} from '@/types/nodes';-import {observer} from "mobx-react-lite";-import { match } from "ts-pattern";-import {SpaceSidebarNode} from "@/components/spaces/space-sidebar-node";-import {NodeTypes} from "@/lib/constants";-import {ChannelSidebarNode} from "@/components/channels/channel-sidebar-node";-import {PageSidebarNode} from "@/components/pages/page-sidebar-node";+import React from 'react';+import { Node } from '@/types/nodes';+import { observer } from 'mobx-react-lite';+import { match } from 'ts-pattern';+import { SpaceSidebarNode } from '@/components/spaces/space-sidebar-node';+import { NodeTypes } from '@/lib/constants';+import { ChannelSidebarNode } from '@/components/channels/channel-sidebar-node';+import { PageSidebarNode } from '@/components/pages/page-sidebar-node';interface SidebarNodeProps {node: Node;}-export const SidebarNode = observer(({node}: SidebarNodeProps) => {+export const SidebarNode = observer(({ node }: SidebarNodeProps) => {return match(node.type).with(NodeTypes.Space, () => <SpaceSidebarNode node={node} />).with(NodeTypes.Channel, () => <ChannelSidebarNode node={node} />).with(NodeTypes.Page, () => <PageSidebarNode node={node} />).otherwise(null);-});\ No newline at end of file+});diff --git a/desktop/src/components/workspaces/sidebar-spaces.tsx b/desktop/src/components/workspaces/sidebar-spaces.tsxindex 95e03977..0a2ae492 100644--- a/desktop/src/components/workspaces/sidebar-spaces.tsx+++ b/desktop/src/components/workspaces/sidebar-spaces.tsx@@ -1,13 +1,12 @@import React from 'react';-import {SpaceCreateButton} from "@/components/spaces/space-create-button";-import {useWorkspace} from "@/contexts/workspace";-import {SidebarNode} from "@/components/workspaces/sidebar-node";-import {observer} from "mobx-react-lite";+import { SpaceCreateButton } from '@/components/spaces/space-create-button';+import { SidebarNode } from '@/components/workspaces/sidebar-node';+import { observer } from 'mobx-react-lite';+import { useSidebar } from '@/contexts/sidebar';export const SidebarSpaces = observer(() => {- const workspace = useWorkspace();- const spaces = workspace.getNodes()- .filter((node) => node.type === 'space');+ const sidebar = useSidebar();+ const spaces = sidebar.nodes.filter((node) => node.type === 'space');return (<div className="pt-3 first:pt-0">@@ -21,5 +20,5 @@ export const SidebarSpaces = observer(() => {))}</div></div>- )-});\ No newline at end of file+ );+});diff --git a/desktop/src/components/workspaces/sidebar.tsx b/desktop/src/components/workspaces/sidebar.tsxindex 16f64954..186a76bb 100644--- a/desktop/src/components/workspaces/sidebar.tsx+++ b/desktop/src/components/workspaces/sidebar.tsx@@ -1,8 +1,14 @@-import React from "react";-import {SidebarHeader} from "@/components/workspaces/sidebar-header";-import {cn} from "@/lib/utils";-import {Icon} from "@/components/ui/icon";-import {SidebarSpaces} from "@/components/workspaces/sidebar-spaces";+import React from 'react';+import { SidebarHeader } from '@/components/workspaces/sidebar-header';+import { cn } from '@/lib/utils';+import { Icon } from '@/components/ui/icon';+import { SidebarSpaces } from '@/components/workspaces/sidebar-spaces';+import { useWorkspace } from '@/contexts/workspace';+import { useEventBus } from '@/hooks/use-event-bus';+import { Node } from '@/types/nodes';+import { SidebarContext } from '@/contexts/sidebar';+import { SidebarStore } from '@/store/sidebar';+import { observer } from 'mobx-react-lite';interface LayoutItem {name: string;@@ -20,50 +26,99 @@ const layouts: LayoutItem[] = [name: 'Spaces',alias: 'space',icon: 'apps-line',- }+ },];-export const Sidebar = () => {+export const Sidebar = observer(() => {+ const workspace = useWorkspace();+ const eventBus = useEventBus();+ const store = React.useMemo(() => new SidebarStore(), [workspace.id]);++ React.useEffect(() => {+ const fetchNodes = async () => {+ store.setIsLoading(true);++ const nodes = await workspace.getSidebarNodes();+ store.setNodes(nodes);++ store.setIsLoading(false);+ };++ fetchNodes();++ const subscriptionId = eventBus.subscribe((event) => {+ if (event.event === 'node_created') {+ const createdNode = event.payload as Node;+ if (store.getNode(createdNode.id) || !createdNode.parentId) {+ store.setNode(createdNode);+ } else {+ const parent = store.getNode(createdNode.parentId);+ if (parent) {+ store.setNode(createdNode);+ }+ }+ }++ if (event.event === 'node_updated') {+ const updatedNode = event.payload as Node;+ store.setNode(updatedNode);+ }++ if (event.event === 'node_deleted') {+ const deletedNodeId = event.payload as string;+ store.deleteNode(deletedNodeId);+ }+ });++ return () => {+ eventBus.unsubscribe(subscriptionId);+ };+ }, [workspace.id]);+const currentLayout = 'spaces';return (- <div className="grid h-full max-h-screen w-full grid-cols-[4rem_1fr] grid-rows-[auto_1fr_auto] border-r border-gray-200">- <div className="col-span-2 h-12">- <SidebarHeader />- </div>- <ul className="mt-2 w-16 border-r border-gray-100 px-1">- {layouts.map((layout) => {- return (- <li- role="presentation"- key={layout.alias}- className={cn(- 'relative mb-1 flex cursor-pointer flex-col items-center justify-center gap-1 rounded-md p-2 hover:bg-gray-100',- currentLayout === layout.alias && 'bg-gray-100',- )}- onClick={() => {-- }}- >- <Icon- name={layout.icon}+ <SidebarContext.Provider+ value={{+ nodes: store.getNodes(),+ }}+ >+ <div className="grid h-full max-h-screen w-full grid-cols-[4rem_1fr] grid-rows-[auto_1fr_auto] border-r border-gray-200">+ <div className="col-span-2 h-12">+ <SidebarHeader />+ </div>+ <ul className="mt-2 w-16 border-r border-gray-100 px-1">+ {layouts.map((layout) => {+ return (+ <li+ role="presentation"+ key={layout.alias}className={cn(- 'h-5 w-5',- currentLayout === layout.alias- ? 'font-bold shadow-sm'- : 'text-muted-foreground',+ 'relative mb-1 flex cursor-pointer flex-col items-center justify-center gap-1 rounded-md p-2 hover:bg-gray-100',+ currentLayout === layout.alias && 'bg-gray-100',)}- />- <span className="py-0.5 text-xs text-muted-foreground">- {layout.name}- </span>- </li>- );- })}- </ul>- <div className="relative mt-2 max-h-full flex-grow overflow-hidden px-1">- <SidebarSpaces />+ onClick={() => {}}+ >+ <Icon+ name={layout.icon}+ className={cn(+ 'h-5 w-5',+ currentLayout === layout.alias+ ? 'font-bold shadow-sm'+ : 'text-muted-foreground',+ )}+ />+ <span className="py-0.5 text-xs text-muted-foreground">+ {layout.name}+ </span>+ </li>+ );+ })}+ </ul>+ <div className="relative mt-2 max-h-full flex-grow overflow-hidden px-1">+ <SidebarSpaces />+ </div></div>- </div>- )-}\ No newline at end of file+ </SidebarContext.Provider>+ );+});diff --git a/desktop/src/components/workspaces/workspace-redirect.tsx b/desktop/src/components/workspaces/workspace-redirect.tsxindex 254bc907..60b496ba 100644--- a/desktop/src/components/workspaces/workspace-redirect.tsx+++ b/desktop/src/components/workspaces/workspace-redirect.tsx@@ -1,8 +1,9 @@import React from 'react';import { useStore } from '@/contexts/store';import { useNavigate } from 'react-router-dom';+import { observer } from 'mobx-react-lite';-export function WorkspaceRedirect(): React.ReactElement {+export const WorkspaceRedirect = observer(() => {const store = useStore();const workspaces = store.workspaces;const navigate = useNavigate();@@ -17,4 +18,4 @@ export function WorkspaceRedirect(): React.ReactElement {}, [workspaces, navigate]);return null;-}+});diff --git a/desktop/src/components/workspaces/workspace.tsx b/desktop/src/components/workspaces/workspace.tsxindex ffc48d4e..d8a4f348 100644--- a/desktop/src/components/workspaces/workspace.tsx+++ b/desktop/src/components/workspaces/workspace.tsx@@ -33,9 +33,6 @@ export const Workspace = observer(() => {inputs,);},- getNodes: () => {- return workspace.getNodes();- },updateNode: async (node) => {await window.workspaceDb.updateNode(workspace.accountId,@@ -73,6 +70,19 @@ export const Workspace = observer(() => {documentId,);},+ getContainerNodes(containerId) {+ return window.workspaceDb.getContainerNodes(+ workspace.accountId,+ workspace.id,+ containerId,+ );+ },+ getSidebarNodes() {+ return window.workspaceDb.getSidebarNodes(+ workspace.accountId,+ workspace.id,+ );+ },navigateToNode(nodeId) {navigate(`/${workspaceId}/${nodeId}`);},diff --git a/desktop/src/contexts/sidebar.ts b/desktop/src/contexts/sidebar.tsnew file mode 100644index 00000000..fa2f566c--- /dev/null+++ b/desktop/src/contexts/sidebar.ts@@ -0,0 +1,12 @@+import { createContext, useContext } from 'react';+import { Node } from '@/types/nodes';++interface SidebarContext {+ nodes: Node[];+}++export const SidebarContext = createContext<SidebarContext>(+ {} as SidebarContext,+);++export const useSidebar = () => useContext(SidebarContext);diff --git a/desktop/src/contexts/workspace.ts b/desktop/src/contexts/workspace.tsindex 697e8b6f..6f21a794 100644--- a/desktop/src/contexts/workspace.ts+++ b/desktop/src/contexts/workspace.ts@@ -5,15 +5,20 @@ import { CreateNodeInput, Node, UpdateNodeInput } from '@/types/nodes';interface WorkspaceContext extends Workspace {createNode: (input: CreateNodeInput) => Promise<void>;createNodes: (inputs: CreateNodeInput[]) => Promise<void>;- getNodes: () => Node[];updateNode: (input: UpdateNodeInput) => Promise<void>;deleteNode: (nodeId: string) => Promise<void>;deleteNodes: (nodeIds: string[]) => Promise<void>;navigateToNode: (nodeId: string) => void;- getConversationNodes: (conversationId: string, count: number, after?: string | null) => Promise<Node[]>;+ getSidebarNodes: () => Promise<Node[]>;+ getConversationNodes: (+ conversationId: string,+ count: number,+ after?: string | null,+ ) => Promise<Node[]>;getDocumentNodes: (documentId: string) => Promise<Node[]>;+ getContainerNodes: (containerId: string) => Promise<Node[]>;}export const WorkspaceContext = createContext<WorkspaceContext>(diff --git a/desktop/src/electron/database/global/index.ts b/desktop/src/electron/database/global/index.tsindex 7329b16d..4637c1af 100644--- a/desktop/src/electron/database/global/index.ts+++ b/desktop/src/electron/database/global/index.ts@@ -6,7 +6,7 @@ import { Account } from '@/types/accounts';import { Workspace } from '@/types/workspaces';import { Transaction, TransactionType } from '@/types/transactions';import { globalDatabaseMigrations } from '@/electron/database/global/migrations';-import { GlobalDatabaseData, WorkspaceDatabaseData } from '@/types/global';+import { GlobalDatabaseData } from '@/types/global';import { WorkspaceDatabase } from '@/electron/database/workspace';export class GlobalDatabase {@@ -29,16 +29,14 @@ export class GlobalDatabase {const accounts = await this.getAccounts();const workspaces = await this.getWorkspaces();- const workspaceDatabaseData: WorkspaceDatabaseData[] = [];for (const workspace of workspaces) {- const data = await this.initWorkspaceDatabase(workspace);- workspaceDatabaseData.push(data);+ await this.initWorkspaceDatabase(workspace);}return {accounts,- workspaces: workspaceDatabaseData,+ workspaces};};@@ -72,7 +70,7 @@ export class GlobalDatabase {initWorkspaceDatabase = async (workspace: Workspace,- ): Promise<WorkspaceDatabaseData> => {+ ): Promise<void> => {const key = `${workspace.accountId}_${workspace.id}`;const workspaceDatabase = new WorkspaceDatabase(workspace.accountId,@@ -82,12 +80,6 @@ export class GlobalDatabase {);await workspaceDatabase.migrate();this.workspaceDatabases.set(key, workspaceDatabase);-- const nodes = await workspaceDatabase.getNodes();- return {- workspace,- nodes,- };};getAccounts = async (): Promise<Account[]> => {diff --git a/desktop/src/electron/database/workspace/index.ts b/desktop/src/electron/database/workspace/index.tsindex 91dfe02b..4567c601 100644--- a/desktop/src/electron/database/workspace/index.ts+++ b/desktop/src/electron/database/workspace/index.ts@@ -1,13 +1,16 @@import { app } from 'electron';import SQLite from 'better-sqlite3';import { Kysely, Migration, Migrator, SqliteDialect } from 'kysely';-import { WorkspaceDatabaseSchema } from '@/electron/database/workspace/schema';+import {+ NodesTableSchema,+ WorkspaceDatabaseSchema,+} from '@/electron/database/workspace/schema';import { workspaceDatabaseMigrations } from '@/electron/database/workspace/migrations';import * as fs from 'node:fs';import { GlobalDatabase } from '@/electron/database/global';import { CreateNodeInput, Node, UpdateNodeInput } from '@/types/nodes';import { NeuronId } from '@/lib/id';-import { LeafNodeTypes, RootNodeTypes } from '@/lib/constants';+import { LeafNodeTypes, NodeTypes, RootNodeTypes } from '@/lib/constants';import { eventBus } from '@/lib/event-bus';export class WorkspaceDatabase {@@ -75,11 +78,11 @@ export class WorkspaceDatabase {created_by: this.userId,version_id: NeuronId.generate(NeuronId.Type.Version),attrs: input.attrs && JSON.stringify(input.attrs),- content: input.content && JSON.stringify(input.content)+ content: input.content && JSON.stringify(input.content),}).returningAll().executeTakeFirst();-+const node: Node = {id: insertedRow.id,type: insertedRow.type,@@ -90,10 +93,12 @@ export class WorkspaceDatabase {content: insertedRow.content && JSON.parse(insertedRow.content),createdAt: new Date(insertedRow.created_at),createdBy: insertedRow.created_by,- updatedAt: insertedRow.updated_at ? new Date(insertedRow.updated_at) : null,+ updatedAt: insertedRow.updated_at+ ? new Date(insertedRow.updated_at)+ : null,updatedBy: insertedRow.updated_by,versionId: insertedRow.version_id,- }+ };await this.globalDatabase.addTransaction({id: NeuronId.generate(NeuronId.Type.Transaction),@@ -108,7 +113,7 @@ export class WorkspaceDatabase {eventBus.publish({event: 'node_created',payload: node,- })+ });};createNodes = async (inputs: CreateNodeInput[]) => {@@ -130,7 +135,7 @@ export class WorkspaceDatabase {).returningAll().execute();-+const nodes = insertedRows.map((node) => ({id: node.id,type: node.type,@@ -145,7 +150,7 @@ export class WorkspaceDatabase {updatedBy: node.updated_by,versionId: node.version_id,}));-+await this.globalDatabase.addTransaction({id: NeuronId.generate(NeuronId.Type.Transaction),type: 'create_nodes',@@ -162,23 +167,27 @@ export class WorkspaceDatabase {payload: node,});});- }+ };updateNode = async (input: UpdateNodeInput) => {- let updateDefinition = this.database- .updateTable('nodes')- .set({- updated_at: new Date().toISOString(),- updated_by: this.userId,- version_id: NeuronId.generate(NeuronId.Type.Version),- });-+ let updateDefinition = this.database.updateTable('nodes').set({+ updated_at: new Date().toISOString(),+ updated_by: this.userId,+ version_id: NeuronId.generate(NeuronId.Type.Version),+ });+if (input.attrs !== undefined) {- updateDefinition = updateDefinition.set('attrs', JSON.stringify(input.attrs));+ updateDefinition = updateDefinition.set(+ 'attrs',+ JSON.stringify(input.attrs),+ );}if (input.content !== undefined) {- updateDefinition = updateDefinition.set('content', JSON.stringify(input.content));+ updateDefinition = updateDefinition.set(+ 'content',+ JSON.stringify(input.content),+ );}if (input.index !== undefined) {@@ -193,21 +202,8 @@ export class WorkspaceDatabase {.where('id', '=', input.id).returningAll().executeTakeFirst();-- const node: Node = {- id: updatedRow.id,- type: updatedRow.type,- index: updatedRow.index,- parentId: updatedRow.parent_id,- workspaceId: updatedRow.workspace_id,- attrs: updatedRow.attrs && JSON.parse(updatedRow.attrs),- content: updatedRow.content && JSON.parse(updatedRow.content),- createdAt: new Date(updatedRow.created_at),- createdBy: updatedRow.created_by,- updatedAt: updatedRow.updated_at ? new Date(updatedRow.updated_at) : null,- updatedBy: updatedRow.updated_by,- versionId: updatedRow.version_id,- };++ const node: Node = this.mapToNode(updatedRow);await this.globalDatabase.addTransaction({id: NeuronId.generate(NeuronId.Type.Transaction),@@ -242,21 +238,7 @@ export class WorkspaceDatabase {createdAt: new Date(),});- const node: Node = {- id: deletedRow.id,- type: deletedRow.type,- index: deletedRow.index,- parentId: deletedRow.parent_id,- workspaceId: deletedRow.workspace_id,- attrs: deletedRow.attrs && JSON.parse(deletedRow.attrs),- content: deletedRow.content && JSON.parse(deletedRow.content),- createdAt: new Date(deletedRow.created_at),- createdBy: deletedRow.created_by,- updatedAt: deletedRow.updated_at ? new Date(deletedRow.updated_at) : null,- updatedBy: deletedRow.updated_by,- versionId: deletedRow.version_id,- };-+ const node: Node = this.mapToNode(deletedRow);eventBus.publish({event: 'node_deleted',payload: node,@@ -280,28 +262,14 @@ export class WorkspaceDatabase {createdAt: new Date(),});- const nodes = deletedRows.map((node) => ({- id: node.id,- type: node.type,- index: node.index,- parentId: node.parent_id,- workspaceId: node.workspace_id,- attrs: node.attrs && JSON.parse(node.attrs),- content: node.content && JSON.parse(node.content),- createdAt: new Date(node.created_at),- createdBy: node.created_by,- updatedAt: node.updated_at ? new Date(node.updated_at) : null,- updatedBy: node.updated_by,- versionId: node.version_id,- }));-+ const nodes = deletedRows.map((node) => this.mapToNode(node));nodes.forEach((node) => {eventBus.publish({event: 'node_deleted',payload: node,});});- }+ };syncNodes = async (nodes: Node[]) => {const nodeIds = nodes.map((node) => node.id);@@ -355,108 +323,148 @@ export class WorkspaceDatabase {}};- getConversationNodes = async (conversationId: string, count: number, after?: string | null): Promise<Node[]> => {+ getSidebarNodes: () => Promise<Node[]> = async () => {+ const spaceRows = await this.database+ .selectFrom('nodes')+ .selectAll()+ .where('type', '=', NodeTypes.Space)+ .execute();++ const spaceIds = spaceRows.map((space) => space.id);+ const childRows = await this.database+ .selectFrom('nodes')+ .selectAll()+ .where('parent_id', 'in', spaceIds)+ .execute();++ const rows = [...spaceRows, ...childRows];+ return rows.map((row) => this.mapToNode(row));+ };++ getConversationNodes = async (+ conversationId: string,+ count: number,+ after?: string | null,+ ): Promise<Node[]> => {const messageQuery = this.database.selectFrom('nodes').selectAll().where('type', '=', 'message').where('parent_id', '=', conversationId);-+if (after) {messageQuery.where('id', '<', after);}- const messages = await messageQuery+ const messageRows = await messageQuery.orderBy('created_at', 'desc').limit(count).execute();-- const authorIds = messages.map((message) => message.created_by);- const authors = await this.database++ const authorIds = messageRows.map((message) => message.created_by);+ const authorRows = await this.database.selectFrom('nodes').selectAll().where('id', 'in', authorIds).execute();-- const parentIds = messages.map((message) => message.id);- const nodes = [...messages, ...authors];-++ const parentIds = messageRows.map((message) => message.id);+ const rows = [...messageRows, ...authorRows];+while (parentIds.length > 0) {- const childNodes = await this.database+ const childRows = await this.database.selectFrom('nodes').selectAll().where('parent_id', 'in', parentIds).execute();-- nodes.push(...childNodes);++ rows.push(...childRows);parentIds.splice(0, parentIds.length);- const newParentIds = childNodes- .filter((node) => !RootNodeTypes.includes(node.type) && !LeafNodeTypes.includes(node.type))- .map((node) => node.id);-+ const newParentIds = childRows+ .filter(+ (row) =>+ !RootNodeTypes.includes(row.type) &&+ !LeafNodeTypes.includes(row.type),+ )+ .map((row) => row.id);+parentIds.push(...newParentIds);}-- return nodes.map((node) => ({- id: node.id,- type: node.type,- index: node.index,- parentId: node.parent_id,- workspaceId: node.workspace_id,- attrs: node.attrs && JSON.parse(node.attrs),- content: node.content && JSON.parse(node.content),- createdAt: new Date(node.created_at),- createdBy: node.created_by,- updatedAt: node.updated_at ? new Date(node.updated_at) : null,- updatedBy: node.updated_by,- versionId: node.version_id,- }));- }- getDocumentNodes = async (documentId: string): Promise<Node[]> => {- const nodes = await this.database+ return rows.map((row) => this.mapToNode(row));+ };++ getDocumentNodes = async (documentId: string): Promise<Node[]> => {+ const rows = await this.database.selectFrom('nodes').selectAll().where('parent_id', '=', documentId).execute();-- const parentIds = nodes- .filter((node) => !RootNodeTypes.includes(node.type) && !LeafNodeTypes.includes(node.type))- .map((node) => node.id);-++ const parentIds = rows+ .filter(+ (row) =>+ !RootNodeTypes.includes(row.type) &&+ !LeafNodeTypes.includes(row.type),+ )+ .map((row) => row.id);+while (parentIds.length > 0) {- const newChildNodes = await this.database+ const childRows = await this.database.selectFrom('nodes').selectAll().where('parent_id', 'in', parentIds).execute();-- nodes.push(...newChildNodes);++ rows.push(...childRows);parentIds.splice(0, parentIds.length);- const newParentIds = newChildNodes- .filter((node) => !RootNodeTypes.includes(node.type) && !LeafNodeTypes.includes(node.type))- .map((node) => node.id);-- parentIds.push(...newParentIds);+ const childParentIds = childRows+ .filter(+ (row) =>+ !RootNodeTypes.includes(row.type) &&+ !LeafNodeTypes.includes(row.type),+ )+ .map((row) => row.id);++ parentIds.push(...childParentIds);}-- return nodes.map((node) => ({- id: node.id,- type: node.type,- index: node.index,- parentId: node.parent_id,- workspaceId: node.workspace_id,- attrs: node.attrs && JSON.parse(node.attrs),- content: node.content && JSON.parse(node.content),- createdAt: new Date(node.created_at),- createdBy: node.created_by,- updatedAt: node.updated_at ? new Date(node.updated_at) : null,- updatedBy: node.updated_by,- versionId: node.version_id,- }));- }++ return rows.map((row) => this.mapToNode(row));+ };++ getContainerNodes = async (containerId: string): Promise<Node[]> => {+ const containerRow = await this.database+ .selectFrom('nodes')+ .selectAll()+ .where('id', '=', containerId)+ .executeTakeFirst();++ if (!containerRow) {+ return [];+ }++ const rows = [containerRow];+ let parentId = containerRow.parent_id;++ while (parentId) {+ const parentRow = await this.database+ .selectFrom('nodes')+ .selectAll()+ .where('id', '=', parentId)+ .executeTakeFirst();++ if (!parentRow) {+ break;+ }++ rows.push(parentRow);+ parentId = parentRow.parent_id;+ }++ return rows.map((row) => this.mapToNode(row));+ };migrate = async () => {const migrator = new Migrator({@@ -470,4 +478,21 @@ export class WorkspaceDatabase {await migrator.migrateToLatest();};++ mapToNode = (node: NodesTableSchema): Node => {+ return {+ id: node.id,+ type: node.type,+ index: node.index,+ parentId: node.parent_id,+ workspaceId: node.workspace_id,+ attrs: node.attrs && JSON.parse(node.attrs),+ content: node.content && JSON.parse(node.content),+ createdAt: new Date(node.created_at),+ createdBy: node.created_by,+ updatedAt: node.updated_at ? new Date(node.updated_at) : null,+ updatedBy: node.updated_by,+ versionId: node.version_id,+ };+ };}diff --git a/desktop/src/hooks/use-container.tsx b/desktop/src/hooks/use-container.tsxnew file mode 100644index 00000000..95fda22b--- /dev/null+++ b/desktop/src/hooks/use-container.tsx@@ -0,0 +1,79 @@+import React from 'react';+import { useWorkspace } from '@/contexts/workspace';+import { Node } from '@/types/nodes';+import { useEventBus } from './use-event-bus';+import { ContainerStore } from '@/store/container';++interface useContainerResult {+ node: Node;+ breadcrumb: Node[];+}++export const useContainer = (containerId: string): useContainerResult => {+ const workspace = useWorkspace();+ const eventBus = useEventBus();+ const store = React.useMemo(() => new ContainerStore(), [containerId]);++ React.useEffect(() => {+ const fetchNodes = async () => {+ store.setIsLoading(true);++ const nodes = await workspace.getContainerNodes(containerId);+ store.setNodes(nodes);++ store.setIsLoading(false);+ };++ fetchNodes();++ const subscriptionId = eventBus.subscribe((event) => {+ if (event.event === 'node_created') {+ const createdNode = event.payload as Node;+ if (+ store.getNode(createdNode.id) ||+ createdNode.parentId === containerId+ ) {+ store.setNode(createdNode);+ } else {+ const parent = store.getNode(createdNode.parentId);+ if (parent) {+ store.setNode(createdNode);+ }+ }+ }++ if (event.event === 'node_updated') {+ const updatedNode = event.payload as Node;+ store.setNode(updatedNode);+ }++ if (event.event === 'node_deleted') {+ const deletedNodeId = event.payload as string;+ store.deleteNode(deletedNodeId);+ }+ });++ return () => {+ eventBus.unsubscribe(subscriptionId);+ };+ }, [containerId]);++ const containerNode = store.getNode(containerId);++ return {+ node: containerNode,+ breadcrumb: buildBreadcrumb(store, containerNode),+ };+};++const buildBreadcrumb = (store: ContainerStore, node?: Node | null): Node[] => {+ const breadcrumb = [];++ let current = node;+ while (current) {+ breadcrumb.unshift(current);+ current = store.getNode(current.parentId);+ }++ return breadcrumb;+};diff --git a/desktop/src/main.ts b/desktop/src/main.tsindex 3010441a..b54c343f 100644--- a/desktop/src/main.ts+++ b/desktop/src/main.ts@@ -127,20 +127,45 @@ ipcMain.handle('delete-nodes', async (_, accountId, workspaceId, nodeIds) => {await workspaceDb.deleteNodes(nodeIds);});-ipcMain.handle('get-conversation-nodes', async (_, accountId, workspaceId, conversationId, count, after) => {+ipcMain.handle('get-sidebar-nodes', async (_, accountId, workspaceId) => {const workspaceDb = globalDatabase.getWorkspaceDatabase(accountId,workspaceId,);- return await workspaceDb.getConversationNodes(conversationId, count, after);+ return await workspaceDb.getSidebarNodes();});-ipcMain.handle('get-document-nodes', async (_, accountId, workspaceId, documentId) => {- const workspaceDb = globalDatabase.getWorkspaceDatabase(- accountId,- workspaceId,- );- return await workspaceDb.getDocumentNodes(documentId);-});+ipcMain.handle(+ 'get-conversation-nodes',+ async (_, accountId, workspaceId, conversationId, count, after) => {+ const workspaceDb = globalDatabase.getWorkspaceDatabase(+ accountId,+ workspaceId,+ );+ return await workspaceDb.getConversationNodes(conversationId, count, after);+ },+);++ipcMain.handle(+ 'get-document-nodes',+ async (_, accountId, workspaceId, documentId) => {+ const workspaceDb = globalDatabase.getWorkspaceDatabase(+ accountId,+ workspaceId,+ );+ return await workspaceDb.getDocumentNodes(documentId);+ },+);++ipcMain.handle(+ 'get-container-nodes',+ async (_, accountId, workspaceId, containerId) => {+ const workspaceDb = globalDatabase.getWorkspaceDatabase(+ accountId,+ workspaceId,+ );+ return await workspaceDb.getContainerNodes(containerId);+ },+);initEventLoop();diff --git a/desktop/src/preload.ts b/desktop/src/preload.tsindex b5288621..de1ae0e1 100644--- a/desktop/src/preload.ts+++ b/desktop/src/preload.ts@@ -19,22 +19,65 @@ contextBridge.exposeInMainWorld('globalDb', {contextBridge.exposeInMainWorld('workspaceDb', {createNode: (accountId: string, workspaceId: string, node: CreateNodeInput) =>ipcRenderer.invoke('create-node', accountId, workspaceId, node),- createNodes: (accountId: string, workspaceId: string, nodes: CreateNodeInput[]) =>- ipcRenderer.invoke('create-nodes', accountId, workspaceId, nodes),+ createNodes: (+ accountId: string,+ workspaceId: string,+ nodes: CreateNodeInput[],+ ) => ipcRenderer.invoke('create-nodes', accountId, workspaceId, nodes),getNodes: (accountId: string, workspaceId: string) =>ipcRenderer.invoke('get-nodes', accountId, workspaceId),- updateNode: (accountId: string, workspaceId: string, input: UpdateNodeInput) =>- ipcRenderer.invoke('update-node', accountId, workspaceId, input),+ updateNode: (+ accountId: string,+ workspaceId: string,+ input: UpdateNodeInput,+ ) => ipcRenderer.invoke('update-node', accountId, workspaceId, input),deleteNode: (accountId: string, workspaceId: string, nodeId: string) =>ipcRenderer.invoke('delete-node', accountId, workspaceId, nodeId),deleteNodes: (accountId: string, workspaceId: string, nodeIds: string[]) =>ipcRenderer.invoke('delete-nodes', accountId, workspaceId, nodeIds),- getConversationNodes: (accountId: string, workspaceId: string, conversationId: string, count: number, after?: string | null) =>- ipcRenderer.invoke('get-conversation-nodes', accountId, workspaceId, conversationId, count, after),+ getSidebarNodes: (accountId: string, workspaceId: string) =>+ ipcRenderer.invoke('get-sidebar-nodes', accountId, workspaceId),- getDocumentNodes: (accountId: string, workspaceId: string, documentId: string) =>- ipcRenderer.invoke('get-document-nodes', accountId, workspaceId, documentId),+ getConversationNodes: (+ accountId: string,+ workspaceId: string,+ conversationId: string,+ count: number,+ after?: string | null,+ ) =>+ ipcRenderer.invoke(+ 'get-conversation-nodes',+ accountId,+ workspaceId,+ conversationId,+ count,+ after,+ ),++ getDocumentNodes: (+ accountId: string,+ workspaceId: string,+ documentId: string,+ ) =>+ ipcRenderer.invoke(+ 'get-document-nodes',+ accountId,+ workspaceId,+ documentId,+ ),++ getContainerNodes: (+ accountId: string,+ workspaceId: string,+ containerId: string,+ ) =>+ ipcRenderer.invoke(+ 'get-container-nodes',+ accountId,+ workspaceId,+ containerId,+ ),});contextBridge.exposeInMainWorld('eventBus', {@@ -45,4 +88,4 @@ contextBridge.exposeInMainWorld('eventBus', {ipcRenderer.on('event', (_, event) => {eventBus.publish(event);-});\ No newline at end of file+});diff --git a/desktop/src/store/container.ts b/desktop/src/store/container.tsnew file mode 100644index 00000000..0cb5a13e--- /dev/null+++ b/desktop/src/store/container.ts@@ -0,0 +1,40 @@+import { Node } from '@/types/nodes';+import { makeAutoObservable } from 'mobx';++export class ContainerStore {+ public nodes: Record<string, Node>;+ public isLoading: boolean;++ constructor() {+ this.nodes = {};+ this.isLoading = false;++ makeAutoObservable(this);+ }++ public setNode(node: Node) {+ this.nodes[node.id] = node;+ }++ public setNodes(nodes: Node[]) {+ nodes.forEach((node) => {+ this.nodes[node.id] = node;+ });+ }++ public deleteNode(nodeId: string) {+ delete this.nodes[nodeId];+ }++ public setIsLoading(isLoading: boolean) {+ this.isLoading = isLoading;+ }++ public getNode(nodeId: string) {+ return this.nodes[nodeId];+ }++ public getNodes() {+ return Object.values(this.nodes);+ }+}\ No newline at end of filediff --git a/desktop/src/store/index.ts b/desktop/src/store/index.tsindex 1e209559..3f483803 100644--- a/desktop/src/store/index.ts+++ b/desktop/src/store/index.ts@@ -1,12 +1,11 @@import { Account } from '@/types/accounts';import { Workspace } from '@/types/workspaces';import { makeAutoObservable } from 'mobx';-import { WorkspaceStore } from '@/store/workspace';export class AppStore {loaded: boolean;accounts: Account[];- workspaces: WorkspaceStore[];+ workspaces: Workspace[];constructor() {this.loaded = false;@@ -33,13 +32,11 @@ export class AppStore {}setWorkspaces(workspaces: Workspace[]) {- this.workspaces = workspaces.map(- (workspace) => new WorkspaceStore(workspace),- );+ this.workspaces = workspaces;}addWorkspace(workspace: Workspace) {- this.workspaces.push(new WorkspaceStore(workspace));+ this.workspaces.push(workspace);}}diff --git a/desktop/src/store/sidebar.ts b/desktop/src/store/sidebar.tsnew file mode 100644index 00000000..c0eb7711--- /dev/null+++ b/desktop/src/store/sidebar.ts@@ -0,0 +1,40 @@+import { Node } from '@/types/nodes';+import { makeAutoObservable } from 'mobx';++export class SidebarStore {+ public nodes: Record<string, Node>;+ public isLoading: boolean;++ constructor() {+ this.nodes = {};+ this.isLoading = false;++ makeAutoObservable(this);+ }++ public setNode(node: Node) {+ this.nodes[node.id] = node;+ }++ public setNodes(nodes: Node[]) {+ nodes.forEach((node) => {+ this.nodes[node.id] = node;+ });+ }++ public deleteNode(nodeId: string) {+ delete this.nodes[nodeId];+ }++ public setIsLoading(isLoading: boolean) {+ this.isLoading = isLoading;+ }++ public getNode(nodeId: string) {+ return this.nodes[nodeId];+ }++ public getNodes() {+ return Object.values(this.nodes);+ }+}diff --git a/desktop/src/store/workspace.ts b/desktop/src/store/workspace.tsdeleted file mode 100644index 5d3177bb..00000000--- a/desktop/src/store/workspace.ts+++ /dev/null@@ -1,55 +0,0 @@-import { Node } from '@/types/nodes';-import { makeAutoObservable } from 'mobx';-import { Workspace, WorkspaceRole } from '@/types/workspaces';--export class WorkspaceStore {- id: string;- name: string;- description?: string | null;- avatar?: string | null;- versionId: string;- accountId: string;- role: WorkspaceRole;- userNodeId: string;- nodes: Record<string, Node>;-- constructor(workspace: Workspace) {- this.id = workspace.id;- this.name = workspace.name;- this.description = workspace.description;- this.avatar = workspace.avatar;- this.versionId = workspace.versionId;- this.accountId = workspace.accountId;- this.role = workspace.role;- this.userNodeId = workspace.userNodeId;- this.nodes = {};-- makeAutoObservable(this);- }-- getNode(nodeId: string) {- return this.nodes[nodeId];- }-- getNodes() {- return Object.values(this.nodes);- }-- setNodes(nodes: Node[]) {- this.nodes = nodes.reduce(- (acc, node) => {- acc[node.id] = node;- return acc;- },- {} as Record<string, Node>,- );- }-- setNode(node: Node) {- this.nodes[node.id] = node;- }-- deleteNode(nodeId: string) {- delete this.nodes[nodeId];- }-}diff --git a/desktop/src/types/global.ts b/desktop/src/types/global.tsindex dfdf780d..451b2368 100644--- a/desktop/src/types/global.ts+++ b/desktop/src/types/global.ts@@ -1,13 +1,7 @@import { Account } from '@/types/accounts';import { Workspace } from '@/types/workspaces';-import { Node } from '@/types/nodes';export type GlobalDatabaseData = {accounts: Account[];- workspaces: WorkspaceDatabaseData[];-};--export type WorkspaceDatabaseData = {- workspace: Workspace;- nodes: Node[];+ workspaces: Workspace[];};diff --git a/desktop/src/types/window.d.ts b/desktop/src/types/window.d.tsindex cd9a1b70..4330f631 100644--- a/desktop/src/types/window.d.ts+++ b/desktop/src/types/window.d.ts@@ -42,6 +42,8 @@ export interface WorkspaceDbApi {nodeIds: string[],) => Promise<void>;+ getSidebarNodes: (accountId: string, workspaceId: string) => Promise<Node[]>;+getConversationNodes: (accountId: string,workspaceId: string,@@ -55,6 +57,12 @@ export interface WorkspaceDbApi {workspaceId: string,documentId: string,) => Promise<Node[]>;++ getContainerNodes: (+ accountId: string,+ workspaceId: string,+ containerId: string,+ ) => Promise<Node[]>;}declare global {