fix: do not request blocks for unsupported types (#1214)

Fixes: #1213
2anki · Jul 13, 2023 · 45b3e84 · 45b3e84
1 parent 3780500
commit 45b3e84
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/src/controllers/NotionController.ts b/src/controllers/NotionController.ts
@@ -104,6 +104,7 @@ class NotionController {
       createdAt: '',
       lastEditedAt: '',
       id,
+      type: 'page',
     });
     res.json(blocks);
   }

diff --git a/src/services/NotionService/BlockHandler/BlockHandler.test.ts b/src/services/NotionService/BlockHandler/BlockHandler.test.ts
@@ -69,6 +69,7 @@ describe('BlockHandler', () => {
       lastEditedAt: '',
       id: '07a7b319183642b9afecdcc4c456f73d',
       all: true,
+      type: 'page',
     });
     const topLevelToggles = getToggleBlocks(blocks.results);
     expect(topLevelToggles.length).toEqual(14);

diff --git a/src/services/NotionService/BlockHandler/BlockHandler.ts b/src/services/NotionService/BlockHandler/BlockHandler.ts
@@ -128,6 +128,7 @@ class BlockHandler {
         lastEditedAt: block.last_edited_time,
         id: block.id,
         all: this.useAll,
+        type: block.type,
       });
       const requestChildren = response2.results;
       return await renderBack(this, requestChildren, response2, handleChildren);
@@ -274,6 +275,7 @@ class BlockHandler {
       lastEditedAt: (page as PageObjectResponse).last_edited_time,
       id: topLevelId,
       all: rules.UNLIMITED,
+      type: 'page',
     });
     const blocks = response.results;
     const flashCardTypes = rules.flaschardTypeNames();
@@ -320,6 +322,7 @@ class BlockHandler {
             lastEditedAt: sd.last_edited_time,
             id: sd.id,
             all: rules.UNLIMITED,
+            type: sd.type,
           });
           const cBlocks = res.results.filter((b: GetBlockResponse) =>
             flashCardTypes.includes((b as BlockObjectResponse).type)

diff --git a/src/services/NotionService/NotionAPIWrapper.ts b/src/services/NotionService/NotionAPIWrapper.ts
@@ -19,13 +19,15 @@ import { getHeadingText } from './helpers/getHeadingText';
 import getObjectTitle from './helpers/getObjectTitle';
 import { getBlockCache } from './helpers/getBlockCache';
 import { getDatabase } from '../../data_layer';
+import { ValidNotionType } from './types';
 
 const DEFAULT_PAGE_SIZE_LIMIT = 100 * 2;
 
 export interface GetBlockParams {
   createdAt: string;
   lastEditedAt: string;
   id: string;
+  type: ValidNotionType;
   all?: boolean;
 }
 
@@ -50,8 +52,22 @@ class NotionAPIWrapper {
     lastEditedAt,
     id,
     all,
+    type,
   }: GetBlockParams): Promise<ListBlockChildrenResponse> {
     console.time(`getBlocks:${id}${all}`);
+
+    // Skip unsupported types to prevent validation errors
+    if (type === 'unsupported') {
+      return {
+        type: 'block',
+        block: {},
+        object: 'list',
+        next_cursor: null,
+        has_more: false,
+        results: [],
+      };
+    }
+
     const cachedPayload = all
       ? await getBlockCache({
           database: getDatabase(),
@@ -210,6 +226,7 @@ class NotionAPIWrapper {
       lastEditedAt: '',
       id: pageId,
       all: rules.UNLIMITED,
+      type: 'page',
     });
     const globalTags = [];
     if (useHeadings) {

diff --git a/src/services/NotionService/_mock/MockNotionAPI.ts b/src/services/NotionService/_mock/MockNotionAPI.ts
@@ -25,6 +25,7 @@ export default class MockNotionAPI extends NotionAPIWrapper {
       lastEditedAt: '',
       id,
       all,
+      type: 'page',
     });
     savePayload(dataMockPath('ListBlockChildrenResponse', id), blocks);
     return blocks;

diff --git a/src/services/NotionService/helpers/getColumn.ts b/src/services/NotionService/helpers/getColumn.ts
@@ -11,6 +11,7 @@ export default async function getColumn(
     createdAt: '',
     lastEditedAt: '',
     id: parentId,
+    type: 'column_list',
   });
   const blocks = getBlocks?.results;
   if (blocks?.length > 0 && blocks?.length >= index + 1) {