🚸 (nocodb) Clean up error messages

Closes #1568
baptisteArno · Jun 14, 2024 · 0f2f4d2 · 0f2f4d2
1 parent ff16706
commit 0f2f4d2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/packages/forge/blocks/nocodb/actions/createRecord.ts b/packages/forge/blocks/nocodb/actions/createRecord.ts
@@ -3,6 +3,7 @@ import { auth } from '../auth'
 import ky, { HTTPError } from 'ky'
 import { defaultBaseUrl } from '../constants'
 import { parseRecordsCreateBody } from '../helpers/parseRecordCreateBody'
+import { parseErrorResponse } from '../helpers/parseErrorResponse'
 
 export const createRecord = createAction({
   auth,
@@ -52,7 +53,7 @@ export const createRecord = createAction({
           return logs.add({
             status: 'error',
             description: error.message,
-            details: await error.response.text(),
+            details: await parseErrorResponse(error.response),
           })
         console.error(error)
       }

diff --git a/packages/forge/blocks/nocodb/actions/searchRecords.ts b/packages/forge/blocks/nocodb/actions/searchRecords.ts
@@ -10,6 +10,7 @@ import {
   defaultLimitForSearch,
   filterOperators,
 } from '../constants'
+import { parseErrorResponse } from '../helpers/parseErrorResponse'
 
 export const searchRecords = createAction({
   auth,
@@ -127,7 +128,7 @@ export const searchRecords = createAction({
           return logs.add({
             status: 'error',
             description: error.message,
-            details: await error.response.text(),
+            details: await parseErrorResponse(error.response),
           })
         console.error(error)
       }

diff --git a/packages/forge/blocks/nocodb/actions/updateExistingRecord.ts b/packages/forge/blocks/nocodb/actions/updateExistingRecord.ts
@@ -10,6 +10,7 @@ import {
 import { parseSearchParams } from '../helpers/parseSearchParams'
 import { convertFilterToWhereClause } from '../helpers/convertFilterToWhereClause'
 import { ListTableRecordsResponse } from '../types'
+import { parseErrorResponse } from '../helpers/parseErrorResponse'
 
 export const updateExistingRecord = createAction({
   auth,
@@ -94,7 +95,7 @@ export const updateExistingRecord = createAction({
           return logs.add({
             status: 'error',
             description: error.message,
-            details: await error.response.text(),
+            details: await parseErrorResponse(error.response),
           })
         console.error(error)
       }

diff --git a/packages/forge/blocks/nocodb/helpers/parseErrorResponse.ts b/packages/forge/blocks/nocodb/helpers/parseErrorResponse.ts
@@ -0,0 +1,9 @@
+export const parseErrorResponse = async (res: Response) => {
+  if (res.headers.get('content-type')?.includes('application/json')) {
+    const json = await res.json()
+    if ('msg' in json) return json.msg
+    return json
+  }
+
+  return res.text()
+}