From 4a70373f3baa1ac21756019dda4bc527795d4a79 Mon Sep 17 00:00:00 2001
From: Xichen Pan <xichen.pan@gmail.com>
Date: Wed, 17 Jan 2024 23:02:22 -0800
Subject: [PATCH 1/2] Add error msg in notification

Add the API response error message in the frontend notification box.

Signed-off-by: Xichen Pan <xichen.pan@gmail.com>
---
 src/api-engine/requirements.txt    |  2 +-
 src/dashboard/src/utils/request.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/api-engine/requirements.txt b/src/api-engine/requirements.txt
index 74138ea94..84453464c 100644
--- a/src/api-engine/requirements.txt
+++ b/src/api-engine/requirements.txt
@@ -27,7 +27,7 @@ Jinja2==2.11.3
 jsonpointer==2.0
 jsonschema==3.2.0
 kubernetes==11.0.0
-MarkupSafe==1.1.1
+MarkupSafe==2.0.1
 oauthlib==3.1.0
 packaging==20.4
 pathtools==0.1.2
diff --git a/src/dashboard/src/utils/request.js b/src/dashboard/src/utils/request.js
index 3bd430f94..43f182858 100644
--- a/src/dashboard/src/utils/request.js
+++ b/src/dashboard/src/utils/request.js
@@ -1,3 +1,4 @@
+import React from 'react';
 import { extend } from 'umi-request';
 import { notification } from 'antd';
 import { history } from 'umi';
@@ -25,8 +26,13 @@ const codeMessage = {
  * 异常处理程序
  */
 const errorHandler = error => {
-  const { response = {} } = error;
-  const errortext = codeMessage[response.status] || response.statusText;
+  const { response, data } = error;
+  const errortext = (
+    <>
+      {codeMessage[response.status] || response.statusText} <br />
+      {data.msg[0]}
+    </>
+  );
   const { status, url } = response;
   let verifyUserFail = false;
 

From 411671063dfeaef6bbd9196bdebd486892bd0994 Mon Sep 17 00:00:00 2001
From: Xichen Pan <xichen.pan@gmail.com>
Date: Fri, 23 Feb 2024 18:37:46 -0800
Subject: [PATCH 2/2] add condition check for error msg

Signed-off-by: Xichen Pan <xichen.pan@gmail.com>
---
 src/dashboard/src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dashboard/src/utils/request.js b/src/dashboard/src/utils/request.js
index 43f182858..90f7710a2 100644
--- a/src/dashboard/src/utils/request.js
+++ b/src/dashboard/src/utils/request.js
@@ -30,7 +30,7 @@ const errorHandler = error => {
   const errortext = (
     <>
       {codeMessage[response.status] || response.statusText} <br />
-      {data.msg[0]}
+      {data && data.msg && Array.isArray(data.msg) && data.msg.length > 0 && data.msg[0]}
     </>
   );
   const { status, url } = response;