From 38c2939d658e752cb21517060db332aaa17e3185 Mon Sep 17 00:00:00 2001
From: "Jingwei.Zhang" <zhang.jingwei@99cloud.net>
Date: Tue, 13 Jun 2023 14:44:48 +0800
Subject: [PATCH] fix: fix the error message

Fix the unreadable error messages with html characters.

Closes-Bug: #2023627
Change-Id: I06d09327d1423578efafc8e51107acb4025e992b
---
 package.json                    | 1 +
 src/components/Notify/index.jsx | 5 ++++-
 yarn.lock                       | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8c8f1597..bc8e912e 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "escape-html": "^1.0.3",
     "file-saver": "^2.0.2",
     "history": "4.7.2",
+    "html-entities": "^2.3.5",
     "intersection-observer": "^0.11.0",
     "intl-messageformat": "7.8.4",
     "invariant": "^2.2.4",
diff --git a/src/components/Notify/index.jsx b/src/components/Notify/index.jsx
index c2535038..3865c062 100644
--- a/src/components/Notify/index.jsx
+++ b/src/components/Notify/index.jsx
@@ -27,6 +27,7 @@ import globalRootStore from 'stores/root';
 import { unescapeHtml } from 'utils/index';
 import { statusMap } from 'src/utils/code';
 import { isEmpty, isString } from 'lodash';
+import { decode } from 'html-entities';
 import styles from './index.less';
 
 const open = (args) => {
@@ -140,6 +141,8 @@ const errorWithDetail = (err, title) => {
       nTitle += statusMap[status];
     }
   } else {
+    const decodeErr =
+      err && isString(err) ? decode(err, { level: 'html5' }) : err;
     // prettier-ignore
     description = err
       ? <ModalButton
@@ -151,7 +154,7 @@ const errorWithDetail = (err, title) => {
         component={
           <CodeEditor
             className={styles['code-editor']}
-            value={err}
+            value={decodeErr}
             mode="json"
             options={{
               readOnly: true,
diff --git a/yarn.lock b/yarn.lock
index 0d523945..c859ac87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7680,6 +7680,11 @@ html-entities@^2.1.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
   integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
+html-entities@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.5.tgz#9f117bf6a5962efc31e094f6c6dad3cf3b95e33e"
+  integrity sha512-72TJlcMkYsEJASa/3HnX7VT59htM7iSHbH59NSZbtc+22Ap0Txnlx91sfeB+/A7wNZg7UxtZdhAW4y+/jimrdg==
+
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"