Skip to content

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

Refactor container components

Hakan Shehu35bb64384abf
diff --git a/apps/desktop/src/renderer/components/channels/channel-body.tsx b/apps/desktop/src/renderer/components/channels/channel-body.tsx
new file mode 100644
index 00000000..0e323dfc
--- /dev/null
+++ b/apps/desktop/src/renderer/components/channels/channel-body.tsx
@@ -0,0 +1,10 @@
+import { ChannelNode } from '@colanode/core';
+import { Conversation } from '@/renderer/components/messages/conversation';
+
+interface ChannelBodyProps {
+ channel: ChannelNode;
+}
+
+export const ChannelBody = ({ channel }: ChannelBodyProps) => {
+ return <Conversation conversationId={channel.id} />;
+};
diff --git a/apps/desktop/src/renderer/components/channels/channel-container.tsx b/apps/desktop/src/renderer/components/channels/channel-container.tsx
index 965e772e..cf4d87e3 100644
--- a/apps/desktop/src/renderer/components/channels/channel-container.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-container.tsx
@@ -1,8 +1,8 @@
-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';
+import { ChannelBody } from '@/renderer/components/channels/channel-body';
interface ChannelContainerProps {
nodeId: string;
@@ -31,7 +31,7 @@ export const ChannelContainer = ({ nodeId }: ChannelContainerProps) => {
return (
<div className="flex h-full w-full flex-col">
<ChannelHeader nodes={nodes} channel={channel} role={role} />
- <Conversation conversationId={nodeId} />
+ <ChannelBody channel={channel} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-body.tsx b/apps/desktop/src/renderer/components/chats/chat-body.tsx
new file mode 100644
index 00000000..c85ec189
--- /dev/null
+++ b/apps/desktop/src/renderer/components/chats/chat-body.tsx
@@ -0,0 +1,10 @@
+import { ChatNode } from '@colanode/core';
+import { Conversation } from '@/renderer/components/messages/conversation';
+
+interface ChatBodyProps {
+ chat: ChatNode;
+}
+
+export const ChatBody = ({ chat }: ChatBodyProps) => {
+ return <Conversation conversationId={chat.id} />;
+};
diff --git a/apps/desktop/src/renderer/components/chats/chat-container.tsx b/apps/desktop/src/renderer/components/chats/chat-container.tsx
index a9d452c1..e3eaee54 100644
--- a/apps/desktop/src/renderer/components/chats/chat-container.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-container.tsx
@@ -1,7 +1,7 @@
-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';
+import { ChatBody } from '@/renderer/components/chats/chat-body';
interface ChatContainerProps {
nodeId: string;
@@ -28,7 +28,7 @@ export const ChatContainer = ({ nodeId }: ChatContainerProps) => {
return (
<div className="flex h-full w-full flex-col">
<ChatHeader chat={node} />
- <Conversation conversationId={nodeId} />
+ <ChatBody chat={node} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/databases/database-body.tsx b/apps/desktop/src/renderer/components/databases/database-body.tsx
new file mode 100644
index 00000000..4f308fdf
--- /dev/null
+++ b/apps/desktop/src/renderer/components/databases/database-body.tsx
@@ -0,0 +1,15 @@
+import { DatabaseNode } from '@colanode/core';
+import { DatabaseViews } from '@/renderer/components/databases/database-views';
+import { Database } from '@/renderer/components/databases/database';
+
+interface DatabaseBodyProps {
+ database: DatabaseNode;
+}
+
+export const DatabaseBody = ({ database }: DatabaseBodyProps) => {
+ return (
+ <Database databaseId={database.id}>
+ <DatabaseViews />
+ </Database>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/databases/database-container.tsx b/apps/desktop/src/renderer/components/databases/database-container.tsx
index 7796e273..70c3b08f 100644
--- a/apps/desktop/src/renderer/components/databases/database-container.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-container.tsx
@@ -1,9 +1,8 @@
-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';
+import { DatabaseBody } from '@/renderer/components/databases/database-body';
interface DatabaseContainerProps {
nodeId: string;
@@ -30,11 +29,9 @@ export const DatabaseContainer = ({ nodeId }: DatabaseContainerProps) => {
}
return (
- <Database databaseId={nodeId}>
- <div className="flex h-full w-full flex-col">
- <DatabaseHeader nodes={nodes} database={database} role={role} />
- <DatabaseViews />
- </div>
- </Database>
+ <div className="flex h-full w-full flex-col">
+ <DatabaseHeader nodes={nodes} database={database} role={role} />
+ <DatabaseBody database={database} />
+ </div>
);
};
diff --git a/apps/desktop/src/renderer/components/files/file-body.tsx b/apps/desktop/src/renderer/components/files/file-body.tsx
new file mode 100644
index 00000000..9deff5b7
--- /dev/null
+++ b/apps/desktop/src/renderer/components/files/file-body.tsx
@@ -0,0 +1,54 @@
+import { FileNode } from '@colanode/core';
+import { Button } from '@/renderer/components/ui/button';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { SquareArrowOutUpRight } from 'lucide-react';
+import { FileDownload } from '@/renderer/components/files/file-download';
+import { FilePreview } from '@/renderer/components/files/file-preview';
+import { FileSidebar } from '@/renderer/components/files/file-sidebar';
+import { getFileUrl } from '@/lib/files';
+
+interface FileBodyProps {
+ file: FileNode;
+}
+
+export const FileBody = ({ file }: FileBodyProps) => {
+ const workspace = useWorkspace();
+ const downloadProgress = 100;
+
+ 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,
+ 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="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>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/files/file-container.tsx b/apps/desktop/src/renderer/components/files/file-container.tsx
index b9974a9b..25376a1f 100644
--- a/apps/desktop/src/renderer/components/files/file-container.tsx
+++ b/apps/desktop/src/renderer/components/files/file-container.tsx
@@ -1,13 +1,8 @@
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
-import { FilePreview } from '@/renderer/components/files/file-preview';
-import { FileSidebar } from '@/renderer/components/files/file-sidebar';
-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 { FileHeader } from '@/renderer/components/files/file-header';
import { extractNodeRole } from '@colanode/core';
+import { FileBody } from '@/renderer/components/files/file-body';
interface FileContainerProps {
nodeId: string;
@@ -28,49 +23,15 @@ export const FileContainer = ({ nodeId }: FileContainerProps) => {
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 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="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>
+ <FileBody file={file} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsx
new file mode 100644
index 00000000..d9b4a826
--- /dev/null
+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx
@@ -0,0 +1,155 @@
+import React from 'react';
+import { FolderNode } from '@colanode/core';
+import { Dropzone } from '@/renderer/components/ui/dropzone';
+import { Button } from '@/renderer/components/ui/button';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from '@/renderer/components/ui/dropdown-menu';
+import { FolderLayoutType } from '@/types/folders';
+import { ScrollArea } from '@/renderer/components/ui/scroll-area';
+import { useMutation } from '@/renderer/hooks/use-mutation';
+import { useWorkspace } from '@/renderer/contexts/workspace';
+import { FolderFiles } from '@/renderer/components/folders/folder-files';
+import {
+ Check,
+ Filter,
+ GalleryVertical,
+ LayoutGrid,
+ List,
+ Upload,
+} from 'lucide-react';
+
+export type FolderLayout = {
+ value: FolderLayoutType;
+ name: string;
+ description: string;
+ icon: React.FC<React.SVGProps<SVGSVGElement>>;
+};
+
+export const folderLayouts: FolderLayout[] = [
+ {
+ name: 'Grid',
+ value: 'grid',
+ description: 'Show files in grid layout',
+ icon: LayoutGrid,
+ },
+ {
+ name: 'List',
+ value: 'list',
+ description: 'Show files in list layout',
+ icon: List,
+ },
+ {
+ name: 'Gallery',
+ value: 'gallery',
+ description: 'Show files in gallery layout',
+ icon: GalleryVertical,
+ },
+];
+
+interface FolderBodyProps {
+ folder: FolderNode;
+}
+
+export const FolderBody = ({ folder }: FolderBodyProps) => {
+ const workspace = useWorkspace();
+ const { mutate } = useMutation();
+
+ const [layout, setLayout] = React.useState<FolderLayoutType>('grid');
+ const isDialogOpenedRef = React.useRef(false);
+
+ const currentLayout =
+ folderLayouts.find((l) => l.value === layout) ?? folderLayouts[0];
+
+ const openFileDialog = async () => {
+ if (isDialogOpenedRef.current) {
+ return;
+ }
+
+ isDialogOpenedRef.current = true;
+ const result = await window.colanode.openFileDialog({
+ properties: ['openFile'],
+ buttonLabel: 'Upload',
+ title: 'Upload files to folder',
+ });
+
+ if (result.canceled) {
+ isDialogOpenedRef.current = false;
+ return;
+ }
+
+ mutate({
+ input: {
+ type: 'file_create',
+ accountId: workspace.accountId,
+ workspaceId: workspace.id,
+ userId: workspace.userId,
+ filePath: result.filePaths[0],
+ parentId: folder.id,
+ },
+ });
+
+ isDialogOpenedRef.current = false;
+ };
+
+ 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>
+ </div>
+ <ScrollArea className="flex-grow">
+ <FolderFiles id={folder.id} name="Folder" layout={layout} />
+ </ScrollArea>
+ </div>
+ {/* <FolderUploads
+ uploads={Object.values(uploads)}
+ open={openUploads}
+ setOpen={setOpenUploads}
+ /> */}
+ </Dropzone>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/folders/folder-container.tsx b/apps/desktop/src/renderer/components/folders/folder-container.tsx
index a0bf2622..a8f10426 100644
--- a/apps/desktop/src/renderer/components/folders/folder-container.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-container.tsx
@@ -1,58 +1,8 @@
-import React from 'react';
-import { Dropzone } from '@/renderer/components/ui/dropzone';
-import { Button } from '@/renderer/components/ui/button';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from '@/renderer/components/ui/dropdown-menu';
-import { FolderLayoutType } from '@/types/folders';
-import { ScrollArea } from '@/renderer/components/ui/scroll-area';
-import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { FolderFiles } from '@/renderer/components/folders/folder-files';
-import {
- Check,
- Filter,
- GalleryVertical,
- LayoutGrid,
- List,
- Upload,
-} from 'lucide-react';
import { useQuery } from '@/renderer/hooks/use-query';
import { extractNodeRole } from '@colanode/core';
import { FolderHeader } from '@/renderer/components/folders/folder-header';
-
-export type FolderLayout = {
- value: FolderLayoutType;
- name: string;
- description: string;
- icon: React.FC<React.SVGProps<SVGSVGElement>>;
-};
-
-export const folderLayouts: FolderLayout[] = [
- {
- name: 'Grid',
- value: 'grid',
- description: 'Show files in grid layout',
- icon: LayoutGrid,
- },
- {
- name: 'List',
- value: 'list',
- description: 'Show files in list layout',
- icon: List,
- },
- {
- name: 'Gallery',
- value: 'gallery',
- description: 'Show files in gallery layout',
- icon: GalleryVertical,
- },
-];
+import { FolderBody } from './folder-body';
interface FolderContainerProps {
nodeId: string;
@@ -60,7 +10,6 @@ interface FolderContainerProps {
export const FolderContainer = ({ nodeId }: FolderContainerProps) => {
const workspace = useWorkspace();
- const { mutate } = useMutation();
const { data, isPending } = useQuery({
type: 'node_with_ancestors_get',
@@ -68,9 +17,6 @@ export const FolderContainer = ({ nodeId }: FolderContainerProps) => {
userId: workspace.userId,
});
- const [layout, setLayout] = React.useState<FolderLayoutType>('grid');
- const isDialogOpenedRef = React.useRef(false);
-
if (isPending) {
return null;
}
@@ -83,96 +29,10 @@ export const FolderContainer = ({ nodeId }: FolderContainerProps) => {
return null;
}
- const currentLayout =
- folderLayouts.find((l) => l.value === layout) ?? folderLayouts[0];
-
- const openFileDialog = async () => {
- if (isDialogOpenedRef.current) {
- return;
- }
-
- isDialogOpenedRef.current = true;
- const result = await window.colanode.openFileDialog({
- properties: ['openFile'],
- buttonLabel: 'Upload',
- title: 'Upload files to folder',
- });
-
- if (result.canceled) {
- isDialogOpenedRef.current = false;
- return;
- }
-
- mutate({
- input: {
- type: 'file_create',
- accountId: workspace.accountId,
- workspaceId: workspace.id,
- userId: workspace.userId,
- filePath: result.filePaths[0],
- parentId: nodeId,
- },
- });
-
- isDialogOpenedRef.current = false;
- };
-
return (
<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>
- {/* <FolderUploads
- uploads={Object.values(uploads)}
- open={openUploads}
- setOpen={setOpenUploads}
- /> */}
- </Dropzone>
+ <FolderBody folder={folder} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/pages/page-body.tsx b/apps/desktop/src/renderer/components/pages/page-body.tsx
new file mode 100644
index 00000000..38ddddf8
--- /dev/null
+++ b/apps/desktop/src/renderer/components/pages/page-body.tsx
@@ -0,0 +1,19 @@
+import { PageNode } from '@colanode/core';
+import { ScrollArea } from '@/renderer/components/ui/scroll-area';
+import { Document } from '@/renderer/components/documents/document';
+
+interface PageBodyProps {
+ page: PageNode;
+}
+
+export const PageBody = ({ page }: PageBodyProps) => {
+ return (
+ <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>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/pages/page-container.tsx b/apps/desktop/src/renderer/components/pages/page-container.tsx
index 91639100..e81f07b7 100644
--- a/apps/desktop/src/renderer/components/pages/page-container.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-container.tsx
@@ -1,9 +1,8 @@
-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';
+import { PageBody } from '@/renderer/components/pages/page-body';
interface PageContainerProps {
nodeId: string;
@@ -32,13 +31,7 @@ export const PageContainer = ({ nodeId }: PageContainerProps) => {
return (
<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>
+ <PageBody page={page} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/records/record-body.tsx b/apps/desktop/src/renderer/components/records/record-body.tsx
new file mode 100644
index 00000000..e506fa21
--- /dev/null
+++ b/apps/desktop/src/renderer/components/records/record-body.tsx
@@ -0,0 +1,29 @@
+import { Database } from '@/renderer/components/databases/database';
+import { RecordAttributes } from '@/renderer/components/records/record-attributes';
+import { ScrollArea } from '@/renderer/components/ui/scroll-area';
+import { Document } from '@/renderer/components/documents/document';
+import { Separator } from '@/renderer/components/ui/separator';
+import { RecordProvider } from '@/renderer/components/records/record-provider';
+import { RecordNode } from '@colanode/core';
+
+interface RecordBodyProps {
+ record: RecordNode;
+}
+
+export const RecordBody = ({ record }: RecordBodyProps) => {
+ return (
+ <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>
+ );
+};
diff --git a/apps/desktop/src/renderer/components/records/record-container.tsx b/apps/desktop/src/renderer/components/records/record-container.tsx
index 798701ab..45b7b617 100644
--- a/apps/desktop/src/renderer/components/records/record-container.tsx
+++ b/apps/desktop/src/renderer/components/records/record-container.tsx
@@ -1,13 +1,8 @@
import { useQuery } from '@/renderer/hooks/use-query';
-import { Database } from '@/renderer/components/databases/database';
-import { RecordAttributes } from '@/renderer/components/records/record-attributes';
-import { ScrollArea } from '@/renderer/components/ui/scroll-area';
-import { Document } from '@/renderer/components/documents/document';
-import { Separator } from '@/renderer/components/ui/separator';
import { 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';
+import { RecordBody } from '@/renderer/components/records/record-body';
interface RecordContainerProps {
nodeId: string;
@@ -36,19 +31,7 @@ export const RecordContainer = ({ nodeId }: RecordContainerProps) => {
return (
<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>
+ <RecordBody record={record} />
</div>
);
};