Merge pull request #265 from NotionX/fix-new-databases

Author: transitive-bullshit

packages/notion-client/src/notion-api.ts

@@ -118,7 +118,7 @@ export class NotionAPI {
           block &&
           (block.type === 'collection_view' ||
             block.type === 'collection_view_page') &&
-          getBlockCollectionId(block)
+          getBlockCollectionId(block, recordMap)
 
         if (collectionId) {
           return block.view_ids?.map((collectionViewId) => ({
@@ -421,6 +421,16 @@ export class NotionAPI {
         }
       }
 
+      //TODO: started working on the filters. This doens't seem to quite work yet.
+      // let filters = collectionView.format?.property_filters.map(filterObj => {
+      //   console.log('map filter', filterObj)
+      //   //get the inner filter
+      //   return {
+      //     filter: filterObj.filter.filter,
+      //     property: filterObj.filter.property
+      //   }
+      // })
+
       const reducerLabel = isBoardType ? 'board_columns' : `${type}_groups`
       loader = {
         type: 'reducer',
@@ -439,6 +449,11 @@ export class NotionAPI {
         ...collectionView?.query2,
         searchQuery,
         userTimeZone
+        //TODO: add filters here
+        // filter: {
+        //   filters: filters,
+        //   operator: 'and'
+        // }
       }
     }
 

packages/notion-utils/src/get-block-collection-id.ts

@@ -1,9 +1,25 @@
-import { Block } from 'notion-types'
+import { Block, ExtendedRecordMap } from 'notion-types'
 
-export function getBlockCollectionId(block: Block): string | null {
-  return (
+export function getBlockCollectionId(
+  block: Block,
+  recordMap: ExtendedRecordMap
+): string | null {
+  const collectionId =
     (block as any).collection_id ||
-    (block as any).format?.collection_pointer?.id ||
-    null
-  )
+    (block as any).format?.collection_pointer?.id
+
+  if (collectionId) {
+    return collectionId
+  }
+
+  const collectionViewId = (block as any)?.view_ids?.[0]
+  if (collectionViewId) {
+    const collectionView = recordMap.collection_view?.[collectionViewId]?.value
+    if (collectionView) {
+      const collectionId = collectionView.format?.collection_pointer?.id
+      return collectionId
+    }
+  }
+
+  return null
 }

packages/notion-utils/src/get-block-icon.ts

@@ -10,7 +10,7 @@ export function getBlockIcon(block: Block, recordMap: ExtendedRecordMap) {
     block.type === 'collection_view_page' ||
     block.type === 'collection_view'
   ) {
-    const collectionId = getBlockCollectionId(block)
+    const collectionId = getBlockCollectionId(block, recordMap)
     if (collectionId) {
       const collection = recordMap.collection[collectionId]?.value
 

packages/notion-utils/src/get-block-title.ts

@@ -11,10 +11,14 @@ export function getBlockTitle(block: Block, recordMap: ExtendedRecordMap) {
     block.type === 'collection_view_page' ||
     block.type === 'collection_view'
   ) {
-    const collection = recordMap.collection[getBlockCollectionId(block)]?.value
+    const collectionId = getBlockCollectionId(block, recordMap)
 
-    if (collection) {
-      return getTextContent(collection.name)
+    if (collectionId) {
+      const collection = recordMap.collection[collectionId]?.value
+
+      if (collection) {
+        return getTextContent(collection.name)
+      }
     }
   }
 

packages/react-notion-x/src/block.tsx

@@ -120,8 +120,8 @@ export const Block: React.FC<BlockProps> = (props) => {
               ? block.properties
               : {
                   title:
-                    recordMap.collection[getBlockCollectionId(block)]?.value
-                      ?.name
+                    recordMap.collection[getBlockCollectionId(block, recordMap)]
+                      ?.value?.name
                 }
 
           const coverPosition = (1 - (page_cover_position || 0.5)) * 100

packages/react-notion-x/src/third-party/collection.tsx

@@ -83,7 +83,7 @@ const CollectionViewBlock: React.FC<{
 }> = ({ block, className }) => {
   const { recordMap, showCollectionViewDropdown } = useNotionContext()
   const { view_ids: viewIds } = block
-  const collectionId = getBlockCollectionId(block)
+  const collectionId = getBlockCollectionId(block, recordMap)
 
   const [isMounted, setIsMounted] = React.useState(false)
   React.useEffect(() => {