Merge commit '2ed08bf7856f569c0617e36e6b14a59e4bddbc71' into modernization-with-fixes

* commit '2ed08bf7856f569c0617e36e6b14a59e4bddbc71':
  fix(search): fix search error not being passed to NotionRenderer properly

Author: onnimonni

lib/search-notion.ts

@@ -20,22 +20,19 @@ async function searchNotionImpl(
     headers: {
       'content-type': 'application/json'
     }
-  })
-    .then((res) => {
-      if (res.ok) {
-        return res
-      }
+  }).then((res) => {
+    if (res.ok) {
+      return res.json()
+    }
 
-      // convert non-2xx HTTP responses into errors
-      const error: any = new Error(res.statusText)
-      error.response = res
-      return Promise.reject(error)
+    return new Promise((resolve) => {
+      res.json().then((json) => {
+        // convert non-2xx HTTP responses into errors
+        // react-notion-x expects an "error" key present in the response
+        // https://github.com/NotionX/react-notion-x/blob/e1f03de6100f2cd33c146eb1c5e67ec4d4afe522/packages/react-notion-x/src/components/search-dialog.tsx#L211
+        json.error = res.statusText
+        resolve(json)
+      })
     })
-    .then((res) => res.json())
-
-  // return ky
-  //   .post(api.searchNotion, {
-  //     json: params
-  //   })
-  //   .json()
+  })
 }

pages/api/search-notion.ts

@@ -11,12 +11,16 @@ export default async (req: NextApiRequest, res: NextApiResponse) => {
   const searchParams: types.SearchParams = req.body
 
   console.log('<<< lambda search-notion', searchParams)
-  const results = await search(searchParams)
-  console.log('>>> lambda search-notion', results)
+  try {
+    const results = await search(searchParams)
+    console.log('>>> lambda search-notion', results)
 
-  res.setHeader(
-    'Cache-Control',
-    'public, s-maxage=60, max-age=60, stale-while-revalidate=60'
-  )
-  res.status(200).json(results)
+    res.setHeader(
+      'Cache-Control',
+      'public, s-maxage=60, max-age=60, stale-while-revalidate=60'
+    )
+    res.status(200).json(results)
+  } catch (error) {
+    res.status(error.response.statusCode).send(error)
+  }
 }