Merge pull request #362 from NotionX/fix-group-by-board

Fixed groupBy board_coumns being added to non board collections query

Author: normdoow

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

@@ -328,9 +328,9 @@ export class NotionAPI {
   ) {
     const type = collectionView?.type
     const isBoardType = type === 'board'
-    const groupBy =
-      collectionView?.format?.board_columns_by ||
-      collectionView?.format?.collection_group_by
+    const groupBy = isBoardType
+      ? collectionView?.format?.board_columns_by
+      : collectionView?.format?.collection_group_by
 
     let filters = []
     if (collectionView.format?.property_filters) {
@@ -344,6 +344,10 @@ export class NotionAPI {
       })
     }
 
+    if (collectionView?.query2?.filter?.filters) {
+      filters.push(...collectionView.query2.filter.filters)
+    }
+
     let loader: any = {
       type: 'reducer',
       reducers: {