Merge pull request #334 from codescalers/development_1.1_fix_unwrap

Fix error was not displayed
codescalers · Feb 1, 2024 · 1071ef1 · 1071ef1
2 parents 2ec311f + 064bb3b
commit 1071ef1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/client/src/clients/api/base.ts b/client/src/clients/api/base.ts
@@ -60,14 +60,12 @@ export abstract class ApiClientBase {
   }
 
   private static normalizeError(err: AxiosError<any>): string {
-    const responseData = err.response?.data
-    const errorMessage = responseData?.message ?? err.message
-
-    const errorDetails = Object.entries(responseData?.error || {})
-      .map(([_, value]) => `${value}`)
-      .join('. ')
-
-    return `${errorMessage}${errorDetails ? `. ${capitalize(errorDetails)}` : ''}`
+    return (
+      err.response?.data?.error?.message ||
+      err.response?.data?.detail ||
+      err.response?.data.message ||
+      err.message
+    )
   }
 
   protected async unwrap<T, R = T>(
@@ -98,6 +96,7 @@ export abstract class ApiClientBase {
     }
 
     if (
+      res &&
       (res.config.method === 'post' || res.config.method === 'put') &&
       typeof res.data === 'object' &&
       'message' in (res.data || {}) &&

diff --git a/client/src/components/NotificationDetailsDialog.vue b/client/src/components/NotificationDetailsDialog.vue
@@ -59,7 +59,10 @@ export default {
         return undefined
       },
       undefined,
-      { immediate: false }
+      {
+        immediate: false,
+        onError: closeDialog
+      }
     )
 
     watch(