ui: fix the error message doesn't show correct (#799)

pingcap · Nov 23, 2020 · d03c863 · d03c863
1 parent 1ff0f33
commit d03c863
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/ui/lib/client/index.tsx b/ui/lib/client/index.tsx
@@ -39,6 +39,7 @@ export enum ErrorStrategy {
   Default = 'default',
   Custom = 'custom',
 }
+const ERR_CODE_OTHER = 'error.api.other'
 
 function initAxios() {
   i18n.addTranslations(require.context('./translations/', false, /\.yaml$/))
@@ -50,15 +51,18 @@ function initAxios() {
     const method = (config.method as string).toLowerCase()
 
     let errCode: string
+    let content: string
     if (err.message === 'Network Error') {
       errCode = 'error.network'
     } else {
-      errCode = response?.data?.code || 'error.api.other'
-      if (errCode === 'error.api.other') {
-        errCode = response?.data?.message || err.message
-      }
+      errCode = response?.data?.code
+    }
+    if (errCode !== ERR_CODE_OTHER && i18next.exists(errCode)) {
+      content = i18next.t(errCode)
+    } else {
+      content =
+        response?.data?.message || err.message || i18next.t(ERR_CODE_OTHER)
     }
-    const content = i18next.t(errCode)
     err.message = content
 
     if (errCode === 'error.api.unauthorized') {