fixed databases for new databases

Author: normdoow

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

@@ -125,6 +125,21 @@ export class NotionAPI {
             collectionId,
             collectionViewId
           }))
+        } else if (block && (block as any).view_ids) {
+          return (block as any).view_ids.map((collectionViewId) => {
+            if (recordMap.collection_view[collectionViewId]) {
+              const viewBlock =
+                recordMap.collection_view[collectionViewId].value
+              const collectionId = viewBlock.format?.collection_pointer?.id
+              if (collectionId) {
+                return {
+                  collectionId,
+                  collectionViewId
+                }
+              }
+            }
+            return null
+          })
         } else {
           return []
         }
@@ -421,6 +436,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 +464,11 @@ export class NotionAPI {
         ...collectionView?.query2,
         searchQuery,
         userTimeZone
+        //TODO: add filters here
+        // filter: {
+        //   filters: filters,
+        //   operator: 'and'
+        // }
       }
     }
 

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

@@ -0,0 +1,18 @@
+import {
+  CollectionViewBlock,
+  CollectionViewPageBlock,
+  ExtendedRecordMap
+} from 'notion-types'
+
+export function getBlockCollectionPointerId(
+  recordMap: ExtendedRecordMap,
+  block: CollectionViewBlock | CollectionViewPageBlock
+): string | null {
+  const collectionViewId = (block as any).view_ids[0]
+  if (recordMap.collection_view[collectionViewId]) {
+    const viewBlock = recordMap.collection_view[collectionViewId].value
+    const collectionId = viewBlock.format?.collection_pointer?.id
+    return collectionId
+  }
+  return null
+}

packages/notion-utils/src/index.ts

@@ -21,3 +21,4 @@ export * from './normalize-title'
 export * from './merge-record-maps'
 export * from './format-date'
 export * from './format-notion-date-time'
+export * from './get-block-collection-pointer-id'

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

@@ -2,6 +2,7 @@ import * as React from 'react'
 import * as types from 'notion-types'
 import {
   getBlockCollectionId,
+  getBlockCollectionPointerId,
   getBlockParentPage,
   getTextContent
 } from 'notion-utils'
@@ -83,7 +84,8 @@ const CollectionViewBlock: React.FC<{
 }> = ({ block, className }) => {
   const { recordMap, showCollectionViewDropdown } = useNotionContext()
   const { view_ids: viewIds } = block
-  const collectionId = getBlockCollectionId(block)
+  const collectionId =
+    getBlockCollectionId(block) ?? getBlockCollectionPointerId(recordMap, block)
 
   const [isMounted, setIsMounted] = React.useState(false)
   React.useEffect(() => {