Skip to content

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

Remove one unecessary query in node container

Hakan Shehu0ede4ece62d3
diff --git a/desktop/src/renderer/components/channels/channel-container-node.tsx b/desktop/src/renderer/components/channels/channel-container-node.tsx
index d6f5889f..10c323a1 100644
--- a/desktop/src/renderer/components/channels/channel-container-node.tsx
+++ b/desktop/src/renderer/components/channels/channel-container-node.tsx
@@ -1,11 +1,10 @@
import React from 'react';
-import { LocalNode } from '@/types/nodes';
import { Conversation } from '@/renderer/components/messages/conversation';
interface ChannelContainerNodeProps {
- node: LocalNode;
+ nodeId: string;
}
-export const ChannelContainerNode = ({ node }: ChannelContainerNodeProps) => {
- return <Conversation conversationId={node.id} />;
+export const ChannelContainerNode = ({ nodeId }: ChannelContainerNodeProps) => {
+ return <Conversation conversationId={nodeId} />;
};
diff --git a/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx b/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
index 305ea23e..97708190 100644
--- a/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
@@ -9,12 +9,12 @@ import { toast } from '@/renderer/components/ui/use-toast';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface NodeCollaboratorCreate {
- id: string;
+ nodeId: string;
existingCollaborators: string[];
}
export const NodeCollaboratorCreate = ({
- id,
+ nodeId,
existingCollaborators,
}: NodeCollaboratorCreate) => {
const workspace = useWorkspace();
@@ -47,7 +47,7 @@ export const NodeCollaboratorCreate = ({
mutate({
input: {
type: 'node_collaborator_create',
- nodeId: id,
+ nodeId,
collaboratorIds: collaborators.map(
(collaborator) => collaborator.id,
),
diff --git a/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx b/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
index ada78f45..96fdca70 100644
--- a/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
@@ -8,11 +8,11 @@ import { Icon } from '@/renderer/components/ui/icon';
import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';
interface NodeCollaboratorsPopoverProps {
- id: string;
+ nodeId: string;
}
export const NodeCollaboratorsPopover = ({
- id,
+ nodeId,
}: NodeCollaboratorsPopoverProps) => {
return (
<Popover>
@@ -23,7 +23,7 @@ export const NodeCollaboratorsPopover = ({
/>
</PopoverTrigger>
<PopoverContent className="mr-2 max-h-128 w-128 overflow-auto">
- <NodeCollaborators id={id} />
+ <NodeCollaborators nodeId={nodeId} />
</PopoverContent>
</Popover>
);
diff --git a/desktop/src/renderer/components/collaborators/node-collaborators.tsx b/desktop/src/renderer/components/collaborators/node-collaborators.tsx
index e90b1c4c..49e492be 100644
--- a/desktop/src/renderer/components/collaborators/node-collaborators.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborators.tsx
@@ -6,14 +6,14 @@ import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface NodeCollaboratorsProps {
- id: string;
+ nodeId: string;
}
-export const NodeCollaborators = ({ id }: NodeCollaboratorsProps) => {
+export const NodeCollaborators = ({ nodeId }: NodeCollaboratorsProps) => {
const workspace = useWorkspace();
const { data, isPending } = useQuery({
type: 'node_collaborator_list',
- nodeId: id,
+ nodeId,
userId: workspace.userId,
});
@@ -24,7 +24,7 @@ export const NodeCollaborators = ({ id }: NodeCollaboratorsProps) => {
return (
<div className="flex flex-col gap-2">
<NodeCollaboratorCreate
- id={id}
+ nodeId={nodeId}
existingCollaborators={data.direct.map(
(collaborator) => collaborator.id,
)}
@@ -38,7 +38,7 @@ export const NodeCollaborators = ({ id }: NodeCollaboratorsProps) => {
{data.direct.map((collaborator) => (
<NodeCollaborator
key={collaborator.id}
- nodeId={id}
+ nodeId={nodeId}
collaborator={collaborator}
removable={true}
/>
@@ -62,7 +62,7 @@ export const NodeCollaborators = ({ id }: NodeCollaboratorsProps) => {
{inheritGroup.collaborators?.map((collaborator) => (
<NodeCollaborator
key={collaborator.id}
- nodeId={id}
+ nodeId={nodeId}
collaborator={collaborator}
/>
))}
diff --git a/desktop/src/renderer/components/databases/database-container-node.tsx b/desktop/src/renderer/components/databases/database-container-node.tsx
index d8b439bc..9da93e71 100644
--- a/desktop/src/renderer/components/databases/database-container-node.tsx
+++ b/desktop/src/renderer/components/databases/database-container-node.tsx
@@ -1,39 +1,34 @@
import React from 'react';
-import { LocalNode } from '@/types/nodes';
import { useQuery } from '@/renderer/hooks/use-query';
import { Database } from '@/renderer/components/databases/database';
import { DatabaseViews } from '@/renderer/components/databases/database-views';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface DatabaseContainerNodeProps {
- node: LocalNode;
+ nodeId: string;
}
-export const DatabaseContainerNode = ({ node }: DatabaseContainerNodeProps) => {
+export const DatabaseContainerNode = ({
+ nodeId,
+}: DatabaseContainerNodeProps) => {
const workspace = useWorkspace();
- const { data: database, isPending: isDatabasePending } = useQuery({
- type: 'database_get',
- databaseId: node.id,
- userId: workspace.userId,
- });
-
const { data: views, isPending: isViewsPending } = useQuery({
type: 'database_view_list',
- databaseId: node.id,
+ databaseId: nodeId,
userId: workspace.userId,
});
- if (isDatabasePending || isViewsPending) {
+ if (isViewsPending) {
return null;
}
- if (!database) {
+ if (!views) {
return null;
}
return (
- <Database node={database}>
+ <Database databaseId={nodeId}>
{views && <DatabaseViews views={views} />}
</Database>
);
diff --git a/desktop/src/renderer/components/databases/database.tsx b/desktop/src/renderer/components/databases/database.tsx
index ec497f69..308c2198 100644
--- a/desktop/src/renderer/components/databases/database.tsx
+++ b/desktop/src/renderer/components/databases/database.tsx
@@ -1,19 +1,35 @@
import React from 'react';
import { DatabaseContext } from '@/renderer/contexts/database';
-import { DatabaseNode } from '@/types/databases';
+import { useQuery } from '@/renderer/hooks/use-query';
+import { useWorkspace } from '@/renderer/contexts/workspace';
interface DatabaseProps {
- node: DatabaseNode;
+ databaseId: string;
children: React.ReactNode;
}
-export const Database = ({ node, children }: DatabaseProps) => {
+export const Database = ({ databaseId, children }: DatabaseProps) => {
+ const workspace = useWorkspace();
+ const { data: database, isPending: isDatabasePending } = useQuery({
+ type: 'database_get',
+ databaseId,
+ userId: workspace.userId,
+ });
+
+ if (isDatabasePending) {
+ return null;
+ }
+
+ if (!database) {
+ return null;
+ }
+
return (
<DatabaseContext.Provider
value={{
- id: node.id,
- name: node.name,
- fields: node.fields,
+ id: database.id,
+ name: database.name,
+ fields: database.fields,
}}
>
{children}
diff --git a/desktop/src/renderer/components/documents/document-editor.tsx b/desktop/src/renderer/components/documents/document-editor.tsx
index 3d32ba1b..1260e495 100644
--- a/desktop/src/renderer/components/documents/document-editor.tsx
+++ b/desktop/src/renderer/components/documents/document-editor.tsx
@@ -54,15 +54,15 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
import { EditorObserver } from '@/renderer/editor/observer';
interface DocumentEditorProps {
- node: LocalNode;
+ nodeId: string;
nodes: Map<string, LocalNode>;
}
-export const DocumentEditor = ({ node, nodes }: DocumentEditorProps) => {
+export const DocumentEditor = ({ nodeId, nodes }: DocumentEditorProps) => {
const workspace = useWorkspace();
const observer = React.useMemo<EditorObserver>(
- () => new EditorObserver(workspace, workspace as any, node, nodes),
- [node.id],
+ () => new EditorObserver(workspace, workspace as any, nodeId, nodes),
+ [nodeId],
);
const editor = useEditor(
@@ -133,7 +133,7 @@ export const DocumentEditor = ({ node, nodes }: DocumentEditorProps) => {
}
},
},
- [node.id],
+ [nodeId],
);
React.useEffect(() => {
diff --git a/desktop/src/renderer/components/documents/document.tsx b/desktop/src/renderer/components/documents/document.tsx
index 7e380466..f2a8b7f4 100644
--- a/desktop/src/renderer/components/documents/document.tsx
+++ b/desktop/src/renderer/components/documents/document.tsx
@@ -1,18 +1,17 @@
import React from 'react';
-import { LocalNode } from '@/types/nodes';
import { DocumentEditor } from '@/renderer/components/documents/document-editor';
import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface DocumentProps {
- node: LocalNode;
+ nodeId: string;
}
-export const Document = ({ node }: DocumentProps) => {
+export const Document = ({ nodeId }: DocumentProps) => {
const workspace = useWorkspace();
const { data, isPending } = useQuery({
type: 'document_get',
- nodeId: node.id,
+ nodeId,
userId: workspace.userId,
});
@@ -20,5 +19,5 @@ export const Document = ({ node }: DocumentProps) => {
return null;
}
- return <DocumentEditor key={node.id} node={node} nodes={data?.nodes} />;
+ return <DocumentEditor key={nodeId} nodeId={nodeId} nodes={data?.nodes} />;
};
diff --git a/desktop/src/renderer/components/pages/page-container-node.tsx b/desktop/src/renderer/components/pages/page-container-node.tsx
index e15324b2..5e4a925c 100644
--- a/desktop/src/renderer/components/pages/page-container-node.tsx
+++ b/desktop/src/renderer/components/pages/page-container-node.tsx
@@ -1,16 +1,15 @@
import React from 'react';
import { ScrollArea } from '@/renderer/components/ui/scroll-area';
-import { LocalNode } from '@/types/nodes';
import { Document } from '@/renderer/components/documents/document';
interface PageContainerNodeProps {
- node: LocalNode;
+ nodeId: string;
}
-export const PageContainerNode = ({ node }: PageContainerNodeProps) => {
+export const PageContainerNode = ({ nodeId }: PageContainerNodeProps) => {
return (
<ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
- <Document node={node} />
+ <Document nodeId={nodeId} />
</ScrollArea>
);
};
diff --git a/desktop/src/renderer/components/records/record-container-node.tsx b/desktop/src/renderer/components/records/record-container-node.tsx
index f5d3c10b..196d26cc 100644
--- a/desktop/src/renderer/components/records/record-container-node.tsx
+++ b/desktop/src/renderer/components/records/record-container-node.tsx
@@ -1,6 +1,5 @@
import React from 'react';
import { useQuery } from '@/renderer/hooks/use-query';
-import { LocalNode } from '@/types/nodes';
import { Database } from '@/renderer/components/databases/database';
import { RecordAttributes } from '@/renderer/components/records/record-attributes';
import { ScrollArea } from '@/renderer/components/ui/scroll-area';
@@ -9,25 +8,19 @@ import { Separator } from '@/renderer/components/ui/separator';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface RecordContainerNodeProps {
- node: LocalNode;
+ nodeId: string;
}
-export const RecordContainerNode = ({ node }: RecordContainerNodeProps) => {
+export const RecordContainerNode = ({ nodeId }: RecordContainerNodeProps) => {
const workspace = useWorkspace();
const { data: record, isPending: isRecordPending } = useQuery({
type: 'record_get',
- recordId: node.id,
+ recordId: nodeId,
userId: workspace.userId,
});
- const { data: database, isPending: isDatabasePending } = useQuery({
- type: 'database_get',
- databaseId: node.parentId,
- userId: workspace.userId,
- });
-
- if (isRecordPending || isDatabasePending) {
+ if (isRecordPending) {
return null;
}
@@ -36,11 +29,11 @@ export const RecordContainerNode = ({ node }: RecordContainerNodeProps) => {
}
return (
- <Database node={database}>
+ <Database databaseId={record.parentId}>
<ScrollArea className="h-full max-h-full w-full overflow-y-auto px-10 pb-12">
<RecordAttributes record={record} />
<Separator className="my-4 w-full" />
- <Document node={node} />
+ <Document nodeId={nodeId} />
</ScrollArea>
</Database>
);
diff --git a/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx b/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
index 63532e2d..be6de8e2 100644
--- a/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
@@ -1,5 +1,4 @@
import React from 'react';
-import { LocalNode } from '@/types/nodes';
import {
Breadcrumb as BreadcrumbWrapper,
BreadcrumbEllipsis,
@@ -25,14 +24,14 @@ import { BreadcrumbItemEditor } from '@/renderer/components/workspaces/container
import { useQuery } from '@/renderer/hooks/use-query';
interface BreadcrumbProps {
- node: LocalNode;
+ nodeId: string;
}
-export const Breadcrumb = ({ node }: BreadcrumbProps) => {
+export const Breadcrumb = ({ nodeId }: BreadcrumbProps) => {
const workspace = useWorkspace();
const { data, isPending } = useQuery({
type: 'breadcrumb_list',
- nodeId: node.id,
+ nodeId,
userId: workspace.userId,
});
@@ -59,7 +58,7 @@ export const Breadcrumb = ({ node }: BreadcrumbProps) => {
}
}}
>
- {breadcrumbNode.id === node.id ? (
+ {breadcrumbNode.id === nodeId ? (
<Popover>
<PopoverTrigger>
<BreadcrumbItem node={breadcrumbNode} />
diff --git a/desktop/src/renderer/components/workspaces/containers/container-header.tsx b/desktop/src/renderer/components/workspaces/containers/container-header.tsx
index 46c94ea1..513c2c4d 100644
--- a/desktop/src/renderer/components/workspaces/containers/container-header.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/container-header.tsx
@@ -1,17 +1,16 @@
import React from 'react';
-import { LocalNode } from '@/types/nodes';
import { Breadcrumb } from '@/renderer/components/workspaces/containers/breadcrumb';
import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
interface ContainerHeaderProps {
- node: LocalNode;
+ nodeId: string;
}
-export const ContainerHeader = ({ node }: ContainerHeaderProps) => {
+export const ContainerHeader = ({ nodeId }: ContainerHeaderProps) => {
return (
<div className="mx-1 flex h-12 items-center justify-between p-2 pr-4 text-foreground/80">
- <Breadcrumb node={node} />
- <NodeCollaboratorsPopover id={node.id} />
+ <Breadcrumb nodeId={nodeId} />
+ <NodeCollaboratorsPopover nodeId={nodeId} />
</div>
);
};
diff --git a/desktop/src/renderer/components/workspaces/containers/container.tsx b/desktop/src/renderer/components/workspaces/containers/container.tsx
index 041b5b26..17e93dcf 100644
--- a/desktop/src/renderer/components/workspaces/containers/container.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/container.tsx
@@ -1,41 +1,30 @@
import React from 'react';
import { match } from 'ts-pattern';
import { useParams } from 'react-router-dom';
-import { NodeTypes } from '@/lib/constants';
import { PageContainerNode } from '@/renderer/components/pages/page-container-node';
import { ChannelContainerNode } from '@/renderer/components/channels/channel-container-node';
import { ContainerHeader } from '@/renderer/components/workspaces/containers/container-header';
-import { Spinner } from '@/renderer/components/ui/spinner';
import { DatabaseContainerNode } from '@/renderer/components/databases/database-container-node';
-import { useQuery } from '@/renderer/hooks/use-query';
import { RecordContainerNode } from '@/renderer/components/records/record-container-node';
import { useWorkspace } from '@/renderer/contexts/workspace';
+import { getIdType, IdType } from '@/lib/id';
export const Container = () => {
const workspace = useWorkspace();
const { nodeId } = useParams<{ nodeId: string }>();
- const { data, isPending } = useQuery({
- type: 'node_get',
- nodeId: nodeId,
- userId: workspace.userId,
- });
-
- if (isPending) {
- return <Spinner />;
- }
-
- if (!data) {
+ if (!nodeId) {
return null;
}
+ const idType = getIdType(nodeId);
return (
<div className="flex h-full w-full flex-col">
- <ContainerHeader node={data} />
- {match(data.type)
- .with(NodeTypes.Channel, () => <ChannelContainerNode node={data} />)
- .with(NodeTypes.Page, () => <PageContainerNode node={data} />)
- .with(NodeTypes.Database, () => <DatabaseContainerNode node={data} />)
- .with(NodeTypes.Record, () => <RecordContainerNode node={data} />)
+ <ContainerHeader nodeId={nodeId} />
+ {match(idType)
+ .with(IdType.Channel, () => <ChannelContainerNode nodeId={nodeId} />)
+ .with(IdType.Page, () => <PageContainerNode nodeId={nodeId} />)
+ .with(IdType.Database, () => <DatabaseContainerNode nodeId={nodeId} />)
+ .with(IdType.Record, () => <RecordContainerNode nodeId={nodeId} />)
.otherwise(() => null)}
</div>
);
diff --git a/desktop/src/renderer/components/workspaces/modals/modal-content.tsx b/desktop/src/renderer/components/workspaces/modals/modal-content.tsx
index 7e0e6ad4..b51d999c 100644
--- a/desktop/src/renderer/components/workspaces/modals/modal-content.tsx
+++ b/desktop/src/renderer/components/workspaces/modals/modal-content.tsx
@@ -1,41 +1,24 @@
import React from 'react';
-import { Spinner } from '@/renderer/components/ui/spinner';
-import { useQuery } from '@/renderer/hooks/use-query';
import { match } from 'ts-pattern';
-import { NodeTypes } from '@/lib/constants';
import { ChannelContainerNode } from '@/renderer/components/channels/channel-container-node';
import { PageContainerNode } from '@/renderer/components/pages/page-container-node';
import { DatabaseContainerNode } from '@/renderer/components/databases/database-container-node';
import { RecordContainerNode } from '@/renderer/components/records/record-container-node';
-import { useWorkspace } from '@/renderer/contexts/workspace';
+import { getIdType, IdType } from '@/lib/id';
interface ModalContentProps {
nodeId: string;
}
export const ModalContent = ({ nodeId }: ModalContentProps) => {
- const workspace = useWorkspace();
- const { data, isPending } = useQuery({
- type: 'node_get',
- nodeId: nodeId,
- userId: workspace.userId,
- });
-
- if (isPending) {
- return <Spinner />;
- }
-
- if (!data) {
- return null;
- }
-
+ const idType = getIdType(nodeId);
return (
<div className="flex h-full w-full flex-col">
- {match(data.type)
- .with(NodeTypes.Channel, () => <ChannelContainerNode node={data} />)
- .with(NodeTypes.Page, () => <PageContainerNode node={data} />)
- .with(NodeTypes.Database, () => <DatabaseContainerNode node={data} />)
- .with(NodeTypes.Record, () => <RecordContainerNode node={data} />)
+ {match(idType)
+ .with(IdType.Channel, () => <ChannelContainerNode nodeId={nodeId} />)
+ .with(IdType.Page, () => <PageContainerNode nodeId={nodeId} />)
+ .with(IdType.Database, () => <DatabaseContainerNode nodeId={nodeId} />)
+ .with(IdType.Record, () => <RecordContainerNode nodeId={nodeId} />)
.otherwise(() => null)}
</div>
);
diff --git a/desktop/src/renderer/editor/observer.ts b/desktop/src/renderer/editor/observer.ts
index a75076b4..fc43e890 100644
--- a/desktop/src/renderer/editor/observer.ts
+++ b/desktop/src/renderer/editor/observer.ts
@@ -16,7 +16,7 @@ import { fromUint8Array, toUint8Array } from 'js-base64';
export class EditorObserver {
private readonly workspace: Workspace;
private readonly database: Kysely<WorkspaceDatabaseSchema>;
- private readonly rootNode: LocalNode;
+ private readonly rootNodeId: string;
private readonly nodesMap: Map<string, LocalNode>;
private editorContent: JSONContent;
@@ -29,12 +29,12 @@ export class EditorObserver {
constructor(
workspace: Workspace,
database: Kysely<WorkspaceDatabaseSchema>,
- rootNode: LocalNode,
+ rootNodeId: string,
nodesMap: Map<string, LocalNode>,
) {
this.workspace = workspace;
this.database = database;
- this.rootNode = rootNode;
+ this.rootNodeId = rootNodeId;
this.nodesMap = nodesMap;
this.editorContent = this.buildEditorContent();
this.onEditorUpdateDebounced = debounce(
@@ -59,7 +59,7 @@ export class EditorObserver {
private buildEditorContent(): JSONContent {
const nodesArray = Array.from(this.nodesMap.values());
- const contents = mapNodesToContents(this.rootNode.id, nodesArray);
+ const contents = mapNodesToContents(this.rootNodeId, nodesArray);
if (!contents.length) {
contents.push({
@@ -76,7 +76,7 @@ export class EditorObserver {
private async checkEditorContentChanges() {
const editorNodes = mapContentsToEditorNodes(
this.editorContent.content,
- this.rootNode.id,
+ this.rootNodeId,
this.nodesMap,
);