Skip to content

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

Fix some bugs in the editor

Hakan Shehu961fec09354f
diff --git a/desktop/src/main/handlers/queries/document-get.ts b/desktop/src/main/handlers/queries/document-get.ts
index 9f6cd4b0..c45e50bd 100644
--- a/desktop/src/main/handlers/queries/document-get.ts
+++ b/desktop/src/main/handlers/queries/document-get.ts
@@ -81,6 +81,13 @@ export class DocumentGetQueryHandler
}
private buildOutput(document: SelectNode | null): DocumentGetQueryOutput {
+ if (!document) {
+ return {
+ content: null,
+ hash: null,
+ };
+ }
+
const node = mapNode(document);
const contents = node.attributes?.content ?? [];
if (!contents.length) {
diff --git a/desktop/src/operations/queries/document-get.ts b/desktop/src/operations/queries/document-get.ts
index 34f052f0..922ab808 100644
--- a/desktop/src/operations/queries/document-get.ts
+++ b/desktop/src/operations/queries/document-get.ts
@@ -7,8 +7,8 @@ export type DocumentGetQueryInput = {
};
export type DocumentGetQueryOutput = {
- content: JSONContent;
- hash: string;
+ content: JSONContent | null;
+ hash: string | null;
};
declare module '@/operations/queries' {
diff --git a/desktop/src/renderer/components/documents/document.tsx b/desktop/src/renderer/components/documents/document.tsx
index c4cc30d6..bb803963 100644
--- a/desktop/src/renderer/components/documents/document.tsx
+++ b/desktop/src/renderer/components/documents/document.tsx
@@ -15,7 +15,7 @@ export const Document = ({ nodeId }: DocumentProps) => {
userId: workspace.userId,
});
- if (isPending || !data) {
+ if (isPending || !data || !data.hash) {
return null;
}
diff --git a/desktop/src/renderer/hooks/use-query.tsx b/desktop/src/renderer/hooks/use-query.tsx
index c9c1a606..b8ee852a 100644
--- a/desktop/src/renderer/hooks/use-query.tsx
+++ b/desktop/src/renderer/hooks/use-query.tsx
@@ -16,6 +16,8 @@ export const useQuery = <T extends QueryInput>(input: T) => {
>(undefined);
React.useEffect(() => {
+ setIsPending(true);
+ setData(undefined);
const queryId = generateId(IdType.Query);
const fetchData = async () => {
try {