Merge pull request #56 from janniks/fix-content

Fix missing/pending blocks
splitbee · Oct 6, 2021 · 6a1af2e · 6a1af2e
2 parents 8b93b03 + bee30a7
commit 6a1af2e
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/routes/page.ts b/src/routes/page.ts
@@ -16,11 +16,18 @@ export async function pageRoute(req: HandlerRequest) {
   let allBlockKeys;
 
   while (true) {
+    allBlockKeys = Object.keys(allBlocks);
 
-    allBlockKeys = allBlocks[pageId!].value.content
+    const pendingBlocks = allBlockKeys.flatMap((blockId) => {
+      const block = allBlocks[blockId];
+      const content = block.value && block.value.content;
+
+      if (!content || (block.value.type === "page" && blockId !== pageId!)) {
+        // skips pages other than the requested page
+        return [];
+      }
 
-    const pendingBlocks = allBlockKeys!.filter((blockId) => {
-      return !allBlocks.hasOwnProperty(blockId)
+      return content.filter((id: string) => !allBlocks[id]);
     });
 
     if (!pendingBlocks.length) {